diff options
author | Arnaud Ebalard <arno@natisbad.org> | 2014-11-21 18:45:56 -0500 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-11-21 23:32:04 -0500 |
commit | 4904a82a9399d037588162e6fb4b293fa6a37f7c (patch) | |
tree | 4066822e180aa9ea41477d2401052ce9716cb260 /arch/arm/boot/dts/armada-xp.dtsi | |
parent | f19d09e430a6a67d3a5c79e861bae97133caf521 (diff) |
arm: mvebu: move Armada 370/XP pinctrl node definition armada-370-xp.dtsi
What was done by Sebastian in 264a05e19bf5 ("ARM: mvebu: armada-xp:
Add node alias to pinctrl and add base address") and 01c434225ee6
("ARM: mvebu: armada-xp: Use pinctrl node alias") can also be done for
Armada 370, i.e.
- Rename Armada 370 pinctrl node to pin-ctrl with its address encoded
- Add a node alias to access the pinctrl node easily.
- use the newly available alias in existing Armada 370 .dts files
We can even go a bit further by putting the pinctrl node definition in
armada-370-xp.dtsi, with only its reg property defined. This allows us
to then also use the newly defined node alias in armada-xp.dtsi,
armada-370.dtsi.
Suggested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Suggested-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
Link: https://lkml.kernel.org/r/b54eb45e5242728aace3ce8aef2eae4251f8dea3.1416613429.git.arno@natisbad.org
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts/armada-xp.dtsi')
-rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 72 |
1 files changed, 35 insertions, 37 deletions
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index e4ba27ef109b..b59a83cf2f26 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi | |||
@@ -73,43 +73,6 @@ | |||
73 | status = "disabled"; | 73 | status = "disabled"; |
74 | }; | 74 | }; |
75 | 75 | ||
76 | pinctrl: pin-ctrl@18000 { | ||
77 | reg = <0x18000 0x38>; | ||
78 | |||
79 | pmx_ge0_gmii: pmx-ge0-gmii { | ||
80 | marvell,pins = | ||
81 | "mpp0", "mpp1", "mpp2", "mpp3", | ||
82 | "mpp4", "mpp5", "mpp6", "mpp7", | ||
83 | "mpp8", "mpp9", "mpp10", "mpp11", | ||
84 | "mpp12", "mpp13", "mpp14", "mpp15", | ||
85 | "mpp16", "mpp17", "mpp18", "mpp19", | ||
86 | "mpp20", "mpp21", "mpp22", "mpp23"; | ||
87 | marvell,function = "ge0"; | ||
88 | }; | ||
89 | |||
90 | pmx_ge0_rgmii: pmx-ge0-rgmii { | ||
91 | marvell,pins = | ||
92 | "mpp0", "mpp1", "mpp2", "mpp3", | ||
93 | "mpp4", "mpp5", "mpp6", "mpp7", | ||
94 | "mpp8", "mpp9", "mpp10", "mpp11"; | ||
95 | marvell,function = "ge0"; | ||
96 | }; | ||
97 | |||
98 | pmx_ge1_rgmii: pmx-ge1-rgmii { | ||
99 | marvell,pins = | ||
100 | "mpp12", "mpp13", "mpp14", "mpp15", | ||
101 | "mpp16", "mpp17", "mpp18", "mpp19", | ||
102 | "mpp20", "mpp21", "mpp22", "mpp23"; | ||
103 | marvell,function = "ge1"; | ||
104 | }; | ||
105 | |||
106 | sdio_pins: sdio-pins { | ||
107 | marvell,pins = "mpp30", "mpp31", "mpp32", | ||
108 | "mpp33", "mpp34", "mpp35"; | ||
109 | marvell,function = "sd0"; | ||
110 | }; | ||
111 | }; | ||
112 | |||
113 | system-controller@18200 { | 76 | system-controller@18200 { |
114 | compatible = "marvell,armada-370-xp-system-controller"; | 77 | compatible = "marvell,armada-370-xp-system-controller"; |
115 | reg = <0x18200 0x500>; | 78 | reg = <0x18200 0x500>; |
@@ -238,3 +201,38 @@ | |||
238 | }; | 201 | }; |
239 | }; | 202 | }; |
240 | }; | 203 | }; |
204 | |||
205 | &pinctrl { | ||
206 | pmx_ge0_gmii: pmx-ge0-gmii { | ||
207 | marvell,pins = | ||
208 | "mpp0", "mpp1", "mpp2", "mpp3", | ||
209 | "mpp4", "mpp5", "mpp6", "mpp7", | ||
210 | "mpp8", "mpp9", "mpp10", "mpp11", | ||
211 | "mpp12", "mpp13", "mpp14", "mpp15", | ||
212 | "mpp16", "mpp17", "mpp18", "mpp19", | ||
213 | "mpp20", "mpp21", "mpp22", "mpp23"; | ||
214 | marvell,function = "ge0"; | ||
215 | }; | ||
216 | |||
217 | pmx_ge0_rgmii: pmx-ge0-rgmii { | ||
218 | marvell,pins = | ||
219 | "mpp0", "mpp1", "mpp2", "mpp3", | ||
220 | "mpp4", "mpp5", "mpp6", "mpp7", | ||
221 | "mpp8", "mpp9", "mpp10", "mpp11"; | ||
222 | marvell,function = "ge0"; | ||
223 | }; | ||
224 | |||
225 | pmx_ge1_rgmii: pmx-ge1-rgmii { | ||
226 | marvell,pins = | ||
227 | "mpp12", "mpp13", "mpp14", "mpp15", | ||
228 | "mpp16", "mpp17", "mpp18", "mpp19", | ||
229 | "mpp20", "mpp21", "mpp22", "mpp23"; | ||
230 | marvell,function = "ge1"; | ||
231 | }; | ||
232 | |||
233 | sdio_pins: sdio-pins { | ||
234 | marvell,pins = "mpp30", "mpp31", "mpp32", | ||
235 | "mpp33", "mpp34", "mpp35"; | ||
236 | marvell,function = "sd0"; | ||
237 | }; | ||
238 | }; | ||