1 From 264a05e19bf50f93f1a377e16497a626ae9f931e Mon Sep 17 00:00:00 2001
2 From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
3 Date: Fri, 19 Sep 2014 21:12:00 +0200
4 Subject: ARM: mvebu: armada-xp: Add node alias to pinctrl and add base address
6 In other MVEBU SoCs, the pin controller node is called pin-ctrl with
7 its base address added. Also, we have a node alias to access the pinctrl
8 node easily. Fix this for Armada XP pinctrl nodes to be consistent with
11 Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
12 Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
13 Tested-By: Benoit Masson <yahoo@perenite.com>
14 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
16 --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
17 +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
23 + pinctrl: pin-ctrl@18000 {
24 pinctrl-0 = <&pmx_phy_int>;
25 pinctrl-names = "default";
27 --- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
28 +++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
34 + pinctrl: pin-ctrl@18000 {
35 poweroff_pin: poweroff-pin {
36 marvell,pins = "mpp24";
37 marvell,function = "gpio";
38 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
39 +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
45 + pinctrl: pin-ctrl@18000 {
46 compatible = "marvell,mv78230-pinctrl";
49 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
50 +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
56 + pinctrl: pin-ctrl@18000 {
57 compatible = "marvell,mv78260-pinctrl";
60 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
61 +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
67 + pinctrl: pin-ctrl@18000 {
68 compatible = "marvell,mv78460-pinctrl";
71 --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
72 +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
78 + pinctrl: pin-ctrl@18000 {
80 marvell,pins = "mpp42";
81 marvell,function = "gpio";
82 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
83 +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
89 + pinctrl: pin-ctrl@18000 {
90 led_pins: led-pins-0 {
91 marvell,pins = "mpp49", "mpp51", "mpp53";
92 marvell,function = "gpio";
93 --- a/arch/arm/boot/dts/armada-xp.dtsi
94 +++ b/arch/arm/boot/dts/armada-xp.dtsi
100 + pinctrl: pin-ctrl@18000 {
101 reg = <0x18000 0x38>;
103 sdio_pins: sdio-pins {