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

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

ARM: mvebu: armada-xp: Consolidate pinctrl node



All current Armada XP SoCs have their pin controller at 0x18000/0x38.
Move the common properties of pinctrl nodes to armada-xp.dtsi to allow
to share pinctrl settings later.

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 dd5dc02e

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

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -169,13 +169,6 @@
	internal-regs {		internal-regs {
	pinctrl {		pinctrl {
	compatible = "marvell,mv78230-pinctrl";		compatible = "marvell,mv78230-pinctrl";
	reg = <0x18000 0x38>;

	sdio_pins: sdio-pins {
	marvell,pins = "mpp30", "mpp31", "mpp32",
	"mpp33", "mpp34", "mpp35";
	marvell,function = "sd0";
	};
	};		};

	gpio0: gpio@18100 {		gpio0: gpio@18100 {

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

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -253,13 +253,6 @@
	internal-regs {		internal-regs {
	pinctrl {		pinctrl {
	compatible = "marvell,mv78260-pinctrl";		compatible = "marvell,mv78260-pinctrl";
	reg = <0x18000 0x38>;

	sdio_pins: sdio-pins {
	marvell,pins = "mpp30", "mpp31", "mpp32",
	"mpp33", "mpp34", "mpp35";
	marvell,function = "sd0";
	};
	};		};

	gpio0: gpio@18100 {		gpio0: gpio@18100 {

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

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -291,13 +291,6 @@
	internal-regs {		internal-regs {
	pinctrl {		pinctrl {
	compatible = "marvell,mv78460-pinctrl";		compatible = "marvell,mv78460-pinctrl";
	reg = <0x18000 0x38>;

	sdio_pins: sdio-pins {
	marvell,pins = "mpp30", "mpp31", "mpp32",
	"mpp33", "mpp34", "mpp35";
	marvell,function = "sd0";
	};
	};		};

	gpio0: gpio@18100 {		gpio0: gpio@18100 {

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

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -72,6 +72,16 @@
	status = "disabled";		status = "disabled";
	};		};

			pinctrl {
			reg = <0x18000 0x38>;

			sdio_pins: sdio-pins {
			marvell,pins = "mpp30", "mpp31", "mpp32",
			"mpp33", "mpp34", "mpp35";
			marvell,function = "sd0";
			};
			};

	system-controller@18200 {		system-controller@18200 {
	compatible = "marvell,armada-370-xp-system-controller";		compatible = "marvell,armada-370-xp-system-controller";
	reg = <0x18200 0x500>;		reg = <0x18200 0x500>;