diff options
-rw-r--r-- | arch/arm/boot/dts/armada-370-db.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-370-mirabox.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-370-xp.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-db.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 2 |
6 files changed, 4 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts index 63120569878a..00044026ef1f 100644 --- a/arch/arm/boot/dts/armada-370-db.dts +++ b/arch/arm/boot/dts/armada-370-db.dts | |||
@@ -50,13 +50,11 @@ | |||
50 | }; | 50 | }; |
51 | 51 | ||
52 | ethernet@d0070000 { | 52 | ethernet@d0070000 { |
53 | clock-frequency = <200000000>; | ||
54 | status = "okay"; | 53 | status = "okay"; |
55 | phy = <&phy0>; | 54 | phy = <&phy0>; |
56 | phy-mode = "rgmii-id"; | 55 | phy-mode = "rgmii-id"; |
57 | }; | 56 | }; |
58 | ethernet@d0074000 { | 57 | ethernet@d0074000 { |
59 | clock-frequency = <200000000>; | ||
60 | status = "okay"; | 58 | status = "okay"; |
61 | phy = <&phy1>; | 59 | phy = <&phy1>; |
62 | phy-mode = "rgmii-id"; | 60 | phy-mode = "rgmii-id"; |
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts index 8554dbee2640..3b4071336599 100644 --- a/arch/arm/boot/dts/armada-370-mirabox.dts +++ b/arch/arm/boot/dts/armada-370-mirabox.dts | |||
@@ -43,13 +43,11 @@ | |||
43 | }; | 43 | }; |
44 | }; | 44 | }; |
45 | ethernet@d0070000 { | 45 | ethernet@d0070000 { |
46 | clock-frequency = <200000000>; | ||
47 | status = "okay"; | 46 | status = "okay"; |
48 | phy = <&phy0>; | 47 | phy = <&phy0>; |
49 | phy-mode = "rgmii-id"; | 48 | phy-mode = "rgmii-id"; |
50 | }; | 49 | }; |
51 | ethernet@d0074000 { | 50 | ethernet@d0074000 { |
52 | clock-frequency = <200000000>; | ||
53 | status = "okay"; | 51 | status = "okay"; |
54 | phy = <&phy1>; | 52 | phy = <&phy1>; |
55 | phy-mode = "rgmii-id"; | 53 | phy-mode = "rgmii-id"; |
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 4c248e30fcb3..4ff108151278 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi | |||
@@ -90,6 +90,7 @@ | |||
90 | compatible = "marvell,armada-370-neta"; | 90 | compatible = "marvell,armada-370-neta"; |
91 | reg = <0xd0070000 0x2500>; | 91 | reg = <0xd0070000 0x2500>; |
92 | interrupts = <8>; | 92 | interrupts = <8>; |
93 | clocks = <&gateclk 4>; | ||
93 | status = "disabled"; | 94 | status = "disabled"; |
94 | }; | 95 | }; |
95 | 96 | ||
@@ -97,6 +98,7 @@ | |||
97 | compatible = "marvell,armada-370-neta"; | 98 | compatible = "marvell,armada-370-neta"; |
98 | reg = <0xd0074000 0x2500>; | 99 | reg = <0xd0074000 0x2500>; |
99 | interrupts = <10>; | 100 | interrupts = <10>; |
101 | clocks = <&gateclk 3>; | ||
100 | status = "disabled"; | 102 | status = "disabled"; |
101 | }; | 103 | }; |
102 | }; | 104 | }; |
diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts index 2673ac7a0fbe..8e53b25b5508 100644 --- a/arch/arm/boot/dts/armada-xp-db.dts +++ b/arch/arm/boot/dts/armada-xp-db.dts | |||
@@ -71,25 +71,21 @@ | |||
71 | }; | 71 | }; |
72 | 72 | ||
73 | ethernet@d0070000 { | 73 | ethernet@d0070000 { |
74 | clock-frequency = <250000000>; | ||
75 | status = "okay"; | 74 | status = "okay"; |
76 | phy = <&phy0>; | 75 | phy = <&phy0>; |
77 | phy-mode = "rgmii-id"; | 76 | phy-mode = "rgmii-id"; |
78 | }; | 77 | }; |
79 | ethernet@d0074000 { | 78 | ethernet@d0074000 { |
80 | clock-frequency = <250000000>; | ||
81 | status = "okay"; | 79 | status = "okay"; |
82 | phy = <&phy1>; | 80 | phy = <&phy1>; |
83 | phy-mode = "rgmii-id"; | 81 | phy-mode = "rgmii-id"; |
84 | }; | 82 | }; |
85 | ethernet@d0030000 { | 83 | ethernet@d0030000 { |
86 | clock-frequency = <250000000>; | ||
87 | status = "okay"; | 84 | status = "okay"; |
88 | phy = <&phy2>; | 85 | phy = <&phy2>; |
89 | phy-mode = "sgmii"; | 86 | phy-mode = "sgmii"; |
90 | }; | 87 | }; |
91 | ethernet@d0034000 { | 88 | ethernet@d0034000 { |
92 | clock-frequency = <250000000>; | ||
93 | status = "okay"; | 89 | status = "okay"; |
94 | phy = <&phy3>; | 90 | phy = <&phy3>; |
95 | phy-mode = "sgmii"; | 91 | phy-mode = "sgmii"; |
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts index bb8d83cfbb50..638fb68d47b2 100644 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | |||
@@ -85,25 +85,21 @@ | |||
85 | }; | 85 | }; |
86 | 86 | ||
87 | ethernet@d0070000 { | 87 | ethernet@d0070000 { |
88 | clock-frequency = <250000000>; | ||
89 | status = "okay"; | 88 | status = "okay"; |
90 | phy = <&phy0>; | 89 | phy = <&phy0>; |
91 | phy-mode = "sgmii"; | 90 | phy-mode = "sgmii"; |
92 | }; | 91 | }; |
93 | ethernet@d0074000 { | 92 | ethernet@d0074000 { |
94 | clock-frequency = <250000000>; | ||
95 | status = "okay"; | 93 | status = "okay"; |
96 | phy = <&phy1>; | 94 | phy = <&phy1>; |
97 | phy-mode = "sgmii"; | 95 | phy-mode = "sgmii"; |
98 | }; | 96 | }; |
99 | ethernet@d0030000 { | 97 | ethernet@d0030000 { |
100 | clock-frequency = <250000000>; | ||
101 | status = "okay"; | 98 | status = "okay"; |
102 | phy = <&phy2>; | 99 | phy = <&phy2>; |
103 | phy-mode = "sgmii"; | 100 | phy-mode = "sgmii"; |
104 | }; | 101 | }; |
105 | ethernet@d0034000 { | 102 | ethernet@d0034000 { |
106 | clock-frequency = <250000000>; | ||
107 | status = "okay"; | 103 | status = "okay"; |
108 | phy = <&phy3>; | 104 | phy = <&phy3>; |
109 | phy-mode = "sgmii"; | 105 | phy-mode = "sgmii"; |
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index fbe30f5e98a8..3744ea18be72 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi | |||
@@ -76,6 +76,7 @@ | |||
76 | compatible = "marvell,armada-370-neta"; | 76 | compatible = "marvell,armada-370-neta"; |
77 | reg = <0xd0030000 0x2500>; | 77 | reg = <0xd0030000 0x2500>; |
78 | interrupts = <12>; | 78 | interrupts = <12>; |
79 | clocks = <&gateclk 2>; | ||
79 | status = "disabled"; | 80 | status = "disabled"; |
80 | }; | 81 | }; |
81 | 82 | ||
@@ -83,6 +84,7 @@ | |||
83 | compatible = "marvell,armada-370-neta"; | 84 | compatible = "marvell,armada-370-neta"; |
84 | reg = <0xd0034000 0x2500>; | 85 | reg = <0xd0034000 0x2500>; |
85 | interrupts = <14>; | 86 | interrupts = <14>; |
87 | clocks = <&gateclk 1>; | ||
86 | status = "disabled"; | 88 | status = "disabled"; |
87 | }; | 89 | }; |
88 | }; | 90 | }; |