All of lore.kernel.org
 help / color / mirror / Atom feed
From: Patrick Menschel <menschel.p@posteo.de>
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 <menschel.p@posteo.de>
Subject: [PATCH v4 4/6] ARM: dts: sun7i: fix device node ordering
Date: Tue,  4 Apr 2017 20:36:30 +0200	[thread overview]
Message-ID: <1491330992-9876-5-git-send-email-menschel.p@posteo.de> (raw)
In-Reply-To: <1491330992-9876-1-git-send-email-menschel.p@posteo.de>

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 <menschel.p@posteo.de>
---
 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 = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&apb1_gates 6>;
+			status = "disabled";
+		};
+
+		ps21: ps2@01c2a400 {
+			compatible = "allwinner,sun4i-a10-ps2";
+			reg = <0x01c2a400 0x400>;
+			interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&apb1_gates 7>;
+			status = "disabled";
+		};
+
 		i2c0: i2c@01c2ac00 {
 			compatible = "allwinner,sun7i-a20-i2c",
 				     "allwinner,sun4i-a10-i2c";
@@ -1629,20 +1645,5 @@
 			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
 		};
 
-		ps20: ps2@01c2a000 {
-			compatible = "allwinner,sun4i-a10-ps2";
-			reg = <0x01c2a000 0x400>;
-			interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&apb1_gates 6>;
-			status = "disabled";
-		};
-
-		ps21: ps2@01c2a400 {
-			compatible = "allwinner,sun4i-a10-ps2";
-			reg = <0x01c2a400 0x400>;
-			interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&apb1_gates 7>;
-			status = "disabled";
-		};
 	};
 };
-- 
2.7.4

WARNING: multiple messages have this Message-ID (diff)
From: menschel.p@posteo.de (Patrick Menschel)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 4/6] ARM: dts: sun7i: fix device node ordering
Date: Tue,  4 Apr 2017 20:36:30 +0200	[thread overview]
Message-ID: <1491330992-9876-5-git-send-email-menschel.p@posteo.de> (raw)
In-Reply-To: <1491330992-9876-1-git-send-email-menschel.p@posteo.de>

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 <menschel.p@posteo.de>
---
 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 = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&apb1_gates 6>;
+			status = "disabled";
+		};
+
+		ps21: ps2 at 01c2a400 {
+			compatible = "allwinner,sun4i-a10-ps2";
+			reg = <0x01c2a400 0x400>;
+			interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&apb1_gates 7>;
+			status = "disabled";
+		};
+
 		i2c0: i2c at 01c2ac00 {
 			compatible = "allwinner,sun7i-a20-i2c",
 				     "allwinner,sun4i-a10-i2c";
@@ -1629,20 +1645,5 @@
 			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
 		};
 
-		ps20: ps2 at 01c2a000 {
-			compatible = "allwinner,sun4i-a10-ps2";
-			reg = <0x01c2a000 0x400>;
-			interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&apb1_gates 6>;
-			status = "disabled";
-		};
-
-		ps21: ps2 at 01c2a400 {
-			compatible = "allwinner,sun4i-a10-ps2";
-			reg = <0x01c2a400 0x400>;
-			interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&apb1_gates 7>;
-			status = "disabled";
-		};
 	};
 };
-- 
2.7.4

  parent reply	other threads:[~2017-04-04 18:36 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-04 18:36 [PATCH v4 0/6] ARM: dts: sunxi: Add CAN node and can0_pins_a pinctrl settings Patrick Menschel
2017-04-04 18:36 ` Patrick Menschel
2017-04-04 18:36 ` [PATCH v4 1/6] ARM: dts: sun4i: fix device node ordering Patrick Menschel
2017-04-04 18:36   ` Patrick Menschel
2017-04-04 18:36 ` [PATCH v4 2/6] ARM: dts: sun4i: Add CAN node Patrick Menschel
2017-04-04 18:36   ` Patrick Menschel
     [not found] ` <1491330992-9876-1-git-send-email-menschel.p-1KBjaw7Xf1+zQB+pC5nmwQ@public.gmane.org>
2017-04-04 18:36   ` [PATCH v4 3/6] ARM: dts: sun4i: Add can0_pins_a pinctrl settings Patrick Menschel
2017-04-04 18:36     ` Patrick Menschel
2017-04-04 18:36     ` Patrick Menschel
2017-04-04 18:36 ` Patrick Menschel [this message]
2017-04-04 18:36   ` [PATCH v4 4/6] ARM: dts: sun7i: fix device node ordering Patrick Menschel
2017-04-04 18:36 ` [PATCH v4 5/6] ARM: dts: sun7i: Add CAN node Patrick Menschel
2017-04-04 18:36   ` Patrick Menschel
2017-04-04 18:36 ` [PATCH v4 6/6] ARM: dts: sun7i: Add can0_pins_a pinctrl settings Patrick Menschel
2017-04-04 18:36   ` Patrick Menschel
2017-04-05  6:22 ` [PATCH v4 0/6] ARM: dts: sunxi: Add CAN node and " Maxime Ripard
2017-04-05  6:22   ` Maxime Ripard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1491330992-9876-5-git-send-email-menschel.p@posteo.de \
    --to=menschel.p@posteo.de \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-can@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=mark.rutland@arm.com \
    --cc=maxime.ripard@free-electrons.com \
    --cc=robh+dt@kernel.org \
    --cc=wens@csie.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.