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 a55a97a..5460161 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 469cf71..baa43a0 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 b5933aa..e24ef07 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 5954b36..53dfb15 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 735924d..8b4ab0a 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 e3a8c45..e7949f4 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 4e5a59e..394f085 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 4010eee..aea7fee 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 {