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-370-rd.dts | |
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-370-rd.dts')
-rw-r--r-- | arch/arm/boot/dts/armada-370-rd.dts | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts index 2bb671a778db..394308951ed9 100644 --- a/arch/arm/boot/dts/armada-370-rd.dts +++ b/arch/arm/boot/dts/armada-370-rd.dts | |||
@@ -59,18 +59,6 @@ | |||
59 | }; | 59 | }; |
60 | 60 | ||
61 | internal-regs { | 61 | internal-regs { |
62 | pinctrl { | ||
63 | fan_pins: fan-pins { | ||
64 | marvell,pins = "mpp8"; | ||
65 | marvell,function = "gpio"; | ||
66 | }; | ||
67 | |||
68 | led_pins: led-pins { | ||
69 | marvell,pins = "mpp32"; | ||
70 | marvell,function = "gpio"; | ||
71 | }; | ||
72 | }; | ||
73 | |||
74 | serial@12000 { | 62 | serial@12000 { |
75 | status = "okay"; | 63 | status = "okay"; |
76 | }; | 64 | }; |
@@ -213,3 +201,15 @@ | |||
213 | }; | 201 | }; |
214 | }; | 202 | }; |
215 | }; | 203 | }; |
204 | |||
205 | &pinctrl { | ||
206 | fan_pins: fan-pins { | ||
207 | marvell,pins = "mpp8"; | ||
208 | marvell,function = "gpio"; | ||
209 | }; | ||
210 | |||
211 | led_pins: led-pins { | ||
212 | marvell,pins = "mpp32"; | ||
213 | marvell,function = "gpio"; | ||
214 | }; | ||
215 | }; | ||