ARM: mvebu: armada-xp: Add node alias to pinctrl and add base address

In other MVEBU SoCs, the pin controller node is called pin-ctrl with
its base address added. Also, we have a node alias to access the pinctrl
node easily. Fix this for Armada XP pinctrl nodes to be consistent with
other SoCs.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-By: Benoit Masson <yahoo@perenite.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index a55a97a705056a72a0e480c9c6a60fc4c1a50381..5460161482834db3fdd464c4c75c93b3f38bbea8 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -60,7 +60,7 @@
                };
 
                internal-regs {
-                       pinctrl {
+                       pinctrl: pin-ctrl@18000 {
                                pinctrl-0 = <&pmx_phy_int>;
                                pinctrl-names = "default";
 

diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
index 469cf7137595fe80bd12086be4eb9eada5b2bdb4..baa43a00429941623a4ff8c0f69b9cfead4ca694 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
+++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
@@ -51,7 +51,7 @@
                };
 
                internal-regs {
-                       pinctrl {
+                       pinctrl: pin-ctrl@18000 {
                                poweroff_pin: poweroff-pin {
                                        marvell,pins = "mpp24";
                                        marvell,function = "gpio";

diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
index b5933aa9ab50c2753dfaf71660f279e18fa1688c..e24ef072b8cba4fed5f05390d90f36e36a81d980 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@ -167,7 +167,7 @@
                };
 
                internal-regs {
-                       pinctrl {
+                       pinctrl: pin-ctrl@18000 {
                                compatible = "marvell,mv78230-pinctrl";
                        };
 

diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
index 5954b362180c83e840136140066e15956c83e066..53dfb157b91a3b53778c2176a8f356ead3269acc 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -251,7 +251,7 @@
                };
 
                internal-regs {
-                       pinctrl {
+                       pinctrl: pin-ctrl@18000 {
                                compatible = "marvell,mv78260-pinctrl";
                        };
 

diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
index 735924d62e12b3dce0373e6fbb6edbc5360ac2d1..8b4ab0a5d6202b287166c431628d51649b41b0e8 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@ -289,7 +289,7 @@
                };
 
                internal-regs {
-                       pinctrl {
+                       pinctrl: pin-ctrl@18000 {
                                compatible = "marvell,mv78460-pinctrl";
                        };
 

diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
index e3a8c456bb84d3047a07011b0be38c85729a5ade..e7949f482529dfff0374afcaf17b8073c8b5c558 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
+++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
@@ -55,7 +55,7 @@
                };
 
                internal-regs {
-                       pinctrl {
+                       pinctrl: pin-ctrl@18000 {
                                poweroff: poweroff {
                                        marvell,pins = "mpp42";
                                        marvell,function = "gpio";

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 4e5a59ee150151f8867ed329a6e05e4f580a3b8c..394f085751be9ada275e1cb50b657e057e0ce183 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -77,7 +77,7 @@
                        serial@12100 {
                                status = "okay";
                        };
-                       pinctrl {
+                       pinctrl: pin-ctrl@18000 {
                                led_pins: led-pins-0 {
                                        marvell,pins = "mpp49", "mpp51", "mpp53";
                                        marvell,function = "gpio";

diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 4010eee93df79752a9dd5d64a8a9250eecd75024..aea7feecd9539745f27456761dc63a3e50105316 100644 (file)
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -72,7 +72,7 @@
                                status = "disabled";
                        };
 
-                       pinctrl {
+                       pinctrl: pin-ctrl@18000 {
                                reg = <0x18000 0x38>;
 
                                sdio_pins: sdio-pins {