Skip to content

Commit

Permalink
arm: mvebu: fix length of Ethernet registers area in .dtsi
Browse files Browse the repository at this point in the history
The length of the registers area for the Marvell 370/XP Ethernet
controller was incorrect in the .dtsi: 0x2400 while it should have
been 0x4000. Until now, this problem wasn't noticed because there was
a large static mapping for all I/Os set up by ->map_io(). But since
we're going to get rid of this static mapping, we need to ensure that
the register areas are properly sized.

Signed-off-by: Thomas Petazzoni <[email protected]>
Signed-off-by: Jason Cooper <[email protected]>
  • Loading branch information
tpetazzoni authored and Jason Cooper committed May 28, 2013
1 parent 911492d commit cf8088c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/armada-370-xp.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,15 @@

ethernet@70000 {
compatible = "marvell,armada-370-neta";
reg = <0x70000 0x2500>;
reg = <0x70000 0x4000>;
interrupts = <8>;
clocks = <&gateclk 4>;
status = "disabled";
};

ethernet@74000 {
compatible = "marvell,armada-370-neta";
reg = <0x74000 0x2500>;
reg = <0x74000 0x4000>;
interrupts = <10>;
clocks = <&gateclk 3>;
status = "disabled";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/armada-xp-mv78460.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@

ethernet@34000 {
compatible = "marvell,armada-370-neta";
reg = <0x34000 0x2500>;
reg = <0x34000 0x4000>;
interrupts = <14>;
clocks = <&gateclk 1>;
status = "disabled";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/armada-xp.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@

ethernet@30000 {
compatible = "marvell,armada-370-neta";
reg = <0x30000 0x2500>;
reg = <0x30000 0x4000>;
interrupts = <12>;
clocks = <&gateclk 2>;
status = "disabled";
Expand Down

0 comments on commit cf8088c

Please sign in to comment.