1 From b324fa60ac94b9c00c59f621743715c036d134fa Mon Sep 17 00:00:00 2001
2 From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
3 Date: Fri, 19 Sep 2014 21:07:09 +0200
4 Subject: ARM: mvebu: armada-xp: Consolidate pinctrl node
6 All current Armada XP SoCs have their pin controller at 0x18000/0x38.
7 Move the common properties of pinctrl nodes to armada-xp.dtsi to allow
8 to share pinctrl settings later.
10 Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
11 Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
12 Tested-By: Benoit Masson <yahoo@perenite.com>
13 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
15 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
16 +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
20 compatible = "marvell,mv78230-pinctrl";
21 - reg = <0x18000 0x38>;
23 - sdio_pins: sdio-pins {
24 - marvell,pins = "mpp30", "mpp31", "mpp32",
25 - "mpp33", "mpp34", "mpp35";
26 - marvell,function = "sd0";
31 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
32 +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
36 compatible = "marvell,mv78260-pinctrl";
37 - reg = <0x18000 0x38>;
39 - sdio_pins: sdio-pins {
40 - marvell,pins = "mpp30", "mpp31", "mpp32",
41 - "mpp33", "mpp34", "mpp35";
42 - marvell,function = "sd0";
47 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
48 +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
52 compatible = "marvell,mv78460-pinctrl";
53 - reg = <0x18000 0x38>;
55 - sdio_pins: sdio-pins {
56 - marvell,pins = "mpp30", "mpp31", "mpp32",
57 - "mpp33", "mpp34", "mpp35";
58 - marvell,function = "sd0";
63 --- a/arch/arm/boot/dts/armada-xp.dtsi
64 +++ b/arch/arm/boot/dts/armada-xp.dtsi
70 + reg = <0x18000 0x38>;
72 + sdio_pins: sdio-pins {
73 + marvell,pins = "mpp30", "mpp31", "mpp32",
74 + "mpp33", "mpp34", "mpp35";
75 + marvell,function = "sd0";
79 system-controller@18200 {
80 compatible = "marvell,armada-370-xp-system-controller";
81 reg = <0x18200 0x500>;