From mboxrd@z Thu Jan 1 00:00:00 1970 From: Patrick Menschel Subject: [PATCH v4 4/6] ARM: dts: sun7i: fix device node ordering Date: Tue, 4 Apr 2017 20:36:30 +0200 Message-ID: <1491330992-9876-5-git-send-email-menschel.p@posteo.de> References: <1491330992-9876-1-git-send-email-menschel.p@posteo.de> Return-path: In-Reply-To: <1491330992-9876-1-git-send-email-menschel.p@posteo.de> Sender: linux-kernel-owner@vger.kernel.org To: robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, maxime.ripard@free-electrons.com, wens@csie.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-can@vger.kernel.org Cc: Patrick Menschel List-Id: linux-can.vger.kernel.org This patch changes the device node position of ps20 and ps21 to fix ordering by rising physical address. From uart7: serial@01c29c00 i2c0: i2c@01c2ac00 i2c1: i2c@01c2b000 i2c2: i2c@01c2b400 i2c3: i2c@01c2b800 i2c4: i2c@01c2c000 gmac: ethernet@01c50000 hstimer@01c60000 gic: interrupt-controller@01c81000 ps20: ps2@01c2a000 ps21: ps2@01c2a400 to uart7: serial@01c29c00 ps20: ps2@01c2a000 ps21: ps2@01c2a400 i2c0: i2c@01c2ac00 i2c1: i2c@01c2b000 i2c2: i2c@01c2b400 i2c3: i2c@01c2b800 i2c4: i2c@01c2c000 gmac: ethernet@01c50000 hstimer@01c60000 gic: interrupt-controller@01c81000 Signed-off-by: Patrick Menschel --- arch/arm/boot/dts/sun7i-a20.dtsi | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 2db97fc..100b4e9 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -1538,6 +1538,22 @@ status = "disabled"; }; + ps20: ps2@01c2a000 { + compatible = "allwinner,sun4i-a10-ps2"; + reg = <0x01c2a000 0x400>; + interrupts = ; + clocks = <&apb1_gates 6>; + status = "disabled"; + }; + + ps21: ps2@01c2a400 { + compatible = "allwinner,sun4i-a10-ps2"; + reg = <0x01c2a400 0x400>; + interrupts = ; + clocks = <&apb1_gates 7>; + status = "disabled"; + }; + i2c0: i2c@01c2ac00 { compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c"; @@ -1629,20 +1645,5 @@ interrupts = ; }; - ps20: ps2@01c2a000 { - compatible = "allwinner,sun4i-a10-ps2"; - reg = <0x01c2a000 0x400>; - interrupts = ; - clocks = <&apb1_gates 6>; - status = "disabled"; - }; - - ps21: ps2@01c2a400 { - compatible = "allwinner,sun4i-a10-ps2"; - reg = <0x01c2a400 0x400>; - interrupts = ; - clocks = <&apb1_gates 7>; - status = "disabled"; - }; }; }; -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: menschel.p@posteo.de (Patrick Menschel) Date: Tue, 4 Apr 2017 20:36:30 +0200 Subject: [PATCH v4 4/6] ARM: dts: sun7i: fix device node ordering In-Reply-To: <1491330992-9876-1-git-send-email-menschel.p@posteo.de> References: <1491330992-9876-1-git-send-email-menschel.p@posteo.de> Message-ID: <1491330992-9876-5-git-send-email-menschel.p@posteo.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org This patch changes the device node position of ps20 and ps21 to fix ordering by rising physical address. From uart7: serial at 01c29c00 i2c0: i2c at 01c2ac00 i2c1: i2c at 01c2b000 i2c2: i2c at 01c2b400 i2c3: i2c at 01c2b800 i2c4: i2c at 01c2c000 gmac: ethernet at 01c50000 hstimer at 01c60000 gic: interrupt-controller at 01c81000 ps20: ps2 at 01c2a000 ps21: ps2 at 01c2a400 to uart7: serial at 01c29c00 ps20: ps2 at 01c2a000 ps21: ps2 at 01c2a400 i2c0: i2c at 01c2ac00 i2c1: i2c at 01c2b000 i2c2: i2c at 01c2b400 i2c3: i2c at 01c2b800 i2c4: i2c at 01c2c000 gmac: ethernet at 01c50000 hstimer at 01c60000 gic: interrupt-controller at 01c81000 Signed-off-by: Patrick Menschel --- arch/arm/boot/dts/sun7i-a20.dtsi | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 2db97fc..100b4e9 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -1538,6 +1538,22 @@ status = "disabled"; }; + ps20: ps2 at 01c2a000 { + compatible = "allwinner,sun4i-a10-ps2"; + reg = <0x01c2a000 0x400>; + interrupts = ; + clocks = <&apb1_gates 6>; + status = "disabled"; + }; + + ps21: ps2 at 01c2a400 { + compatible = "allwinner,sun4i-a10-ps2"; + reg = <0x01c2a400 0x400>; + interrupts = ; + clocks = <&apb1_gates 7>; + status = "disabled"; + }; + i2c0: i2c at 01c2ac00 { compatible = "allwinner,sun7i-a20-i2c", "allwinner,sun4i-a10-i2c"; @@ -1629,20 +1645,5 @@ interrupts = ; }; - ps20: ps2 at 01c2a000 { - compatible = "allwinner,sun4i-a10-ps2"; - reg = <0x01c2a000 0x400>; - interrupts = ; - clocks = <&apb1_gates 6>; - status = "disabled"; - }; - - ps21: ps2 at 01c2a400 { - compatible = "allwinner,sun4i-a10-ps2"; - reg = <0x01c2a400 0x400>; - interrupts = ; - clocks = <&apb1_gates 7>; - status = "disabled"; - }; }; }; -- 2.7.4