Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 264a05e1 authored Sep 19, 2014 by Sebastian Hesselbarth Committed by Jason Cooper Nov 02, 2014

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>

parent b324fa60

arch/arm/boot/dts/armada-xp-axpwifiap.dts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,7 +60,7 @@
	};		};

	internal-regs {		internal-regs {
	pinctrl {		pinctrl: pin-ctrl@18000 {
	pinctrl-0 = <&pmx_phy_int>;		pinctrl-0 = <&pmx_phy_int>;
	pinctrl-names = "default";		pinctrl-names = "default";

arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,7 @@
	};		};

	internal-regs {		internal-regs {
	pinctrl {		pinctrl: pin-ctrl@18000 {
	poweroff_pin: poweroff-pin {		poweroff_pin: poweroff-pin {
	marvell,pins = "mpp24";		marvell,pins = "mpp24";
	marvell,function = "gpio";		marvell,function = "gpio";

arch/arm/boot/dts/armada-xp-mv78230.dtsi

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -167,7 +167,7 @@
	};		};

	internal-regs {		internal-regs {
	pinctrl {		pinctrl: pin-ctrl@18000 {
	compatible = "marvell,mv78230-pinctrl";		compatible = "marvell,mv78230-pinctrl";
	};		};

arch/arm/boot/dts/armada-xp-mv78260.dtsi

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -251,7 +251,7 @@
	};		};

	internal-regs {		internal-regs {
	pinctrl {		pinctrl: pin-ctrl@18000 {
	compatible = "marvell,mv78260-pinctrl";		compatible = "marvell,mv78260-pinctrl";
	};		};

arch/arm/boot/dts/armada-xp-mv78460.dtsi

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -289,7 +289,7 @@
	};		};

	internal-regs {		internal-regs {
	pinctrl {		pinctrl: pin-ctrl@18000 {
	compatible = "marvell,mv78460-pinctrl";		compatible = "marvell,mv78460-pinctrl";
	};		};