From: Simon Horman <horms@verge.net.au>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Yoshihiro Kaneko <ykaneko0929@gmail.com>,
Linux-Renesas <linux-renesas-soc@vger.kernel.org>,
Magnus Damm <magnus.damm@gmail.com>,
Linux ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH/RFT] arm: dts: renesas: r7s9210-rza2mevb: sort nodes of rza2mevb board
Date: Wed, 29 May 2019 12:22:24 +0200 [thread overview]
Message-ID: <20190529102219.pkhwalbm6feaq4tz@verge.net.au> (raw)
In-Reply-To: <CAMuHMdUmmwmm2bx+g=G-py5FiQ5Ynrmxr262j61P5=y5GTA6OQ@mail.gmail.com>
On Tue, May 28, 2019 at 10:08:29AM +0200, Geert Uytterhoeven wrote:
> Hi Kaneko-san,
>
> On Fri, May 17, 2019 at 4:43 PM Yoshihiro Kaneko <ykaneko0929@gmail.com> wrote:
> > This patch sorts the nodes of arch/arm/boot/dts/r7s9210-rza2mevb.dts.
> >
> > * Sort subnodes of root ("/") node alphabetically
> > * Sort following top-level nodes alphabetically
> > * Sort subnodes of pinctrl alphabetically
> >
> > Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
>
> Thanks for your patch!
>
> > This patch is based on the devel branch of Simon Horman's renesas tree.
>
> This looks good to me, but in the mean time renesas-devel has progressed.
> Can you please respin?
I guess the same thing could happen again so I have gone ahead
and both updated and applied the patch. The result is as follows:
From da06407455334bd8ec24e9c434691d3dd68571f8 Mon Sep 17 00:00:00 2001
From: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date: Fri, 17 May 2019 23:43:07 +0900
Subject: [PATCH] arm: dts: rza2mevb: sort nodes of rza2mevb board
This patch sorts the nodes of arch/arm/boot/dts/r7s9210-rza2mevb.dts.
* Sort subnodes of root ("/") node alphabetically
* Sort following top-level nodes alphabetically
* Sort subnodes of pinctrl alphabetically
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
[simon: rebase and sort new ehci nodes]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r7s9210-rza2mevb.dts | 104 ++++++++++++++++-----------------
1 file changed, 52 insertions(+), 52 deletions(-)
diff --git a/arch/arm/boot/dts/r7s9210-rza2mevb.dts b/arch/arm/boot/dts/r7s9210-rza2mevb.dts
index e140168da573..49c40065741b 100644
--- a/arch/arm/boot/dts/r7s9210-rza2mevb.dts
+++ b/arch/arm/boot/dts/r7s9210-rza2mevb.dts
@@ -26,11 +26,6 @@
stdout-path = "serial0:115200n8";
};
- memory@40000000 {
- device_type = "memory";
- reg = <0x40000000 0x00800000>; /* HyperRAM */
- };
-
lbsc {
#address-cells = <1>;
#size-cells = <1>;
@@ -46,6 +41,41 @@
gpios = <&pinctrl RZA2_PIN(PORTC, 1) GPIO_ACTIVE_HIGH>;
};
};
+
+ memory@40000000 {
+ device_type = "memory";
+ reg = <0x40000000 0x00800000>; /* HyperRAM */
+ };
+};
+
+&ehci0 {
+ status = "okay";
+};
+
+&ehci1 {
+ status = "okay";
+};
+
+ðer0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <ð0_pins>;
+ status = "okay";
+ renesas,no-ether-link;
+ phy-handle = <&phy0>;
+ phy0: ethernet-phy@0 {
+ reg = <0>;
+ };
+};
+
+ðer1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <ð1_pins>;
+ status = "okay";
+ renesas,no-ether-link;
+ phy-handle = <&phy1>;
+ phy1: ethernet-phy@1 {
+ reg = <0>;
+ };
};
/* EXTAL */
@@ -53,23 +83,16 @@
clock-frequency = <24000000>; /* 24MHz */
};
-/* RTC_X1 */
-&rtc_x1_clk {
- clock-frequency = <32768>;
+/* High resolution System tick timers */
+&ostm0 {
+ status = "okay";
};
-/* USB_X1 */
-&usb_x1_clk {
- clock-frequency = <48000000>;
+&ostm1 {
+ status = "okay";
};
&pinctrl {
- /* Serial Console */
- scif4_pins: serial4 {
- pinmux = <RZA2_PINMUX(PORT9, 0, 4)>, /* TxD4 */
- <RZA2_PINMUX(PORT9, 1, 4)>; /* RxD4 */
- };
-
eth0_pins: eth0 {
pinmux = <RZA2_PINMUX(PORTE, 0, 7)>, /* REF50CK0 */
<RZA2_PINMUX(PORT6, 1, 7)>, /* RMMI0_TXDEN */
@@ -98,6 +121,12 @@
<RZA2_PINMUX(PORTL, 1, 5)>; /* IRQ5 */
};
+ /* Serial Console */
+ scif4_pins: serial4 {
+ pinmux = <RZA2_PINMUX(PORT9, 0, 4)>, /* TxD4 */
+ <RZA2_PINMUX(PORT9, 1, 4)>; /* RxD4 */
+ };
+
sdhi0_pins: sdhi0 {
pinmux = <RZA2_PINMUX(PORT5, 0, 3)>, /* SD0_CD */
<RZA2_PINMUX(PORT5, 1, 3)>; /* SD0_WP */
@@ -121,13 +150,9 @@
};
};
-/* High resolution System tick timers */
-&ostm0 {
- status = "okay";
-};
-
-&ostm1 {
- status = "okay";
+/* RTC_X1 */
+&rtc_x1_clk {
+ clock-frequency = <32768>;
};
/* Serial Console */
@@ -138,28 +163,6 @@
status = "okay";
};
-ðer0 {
- pinctrl-names = "default";
- pinctrl-0 = <ð0_pins>;
- status = "okay";
- renesas,no-ether-link;
- phy-handle = <&phy0>;
- phy0: ethernet-phy@0 {
- reg = <0>;
- };
-};
-
-ðer1 {
- pinctrl-names = "default";
- pinctrl-0 = <ð1_pins>;
- status = "okay";
- renesas,no-ether-link;
- phy-handle = <&phy1>;
- phy1: ethernet-phy@1 {
- reg = <0>;
- };
-};
-
&sdhi0 {
pinctrl-names = "default";
pinctrl-0 = <&sdhi0_pins>;
@@ -182,10 +185,6 @@
status = "okay";
};
-&ehci0 {
- status = "okay";
-};
-
/* USB-1 as Host */
&usb2_phy1 {
pinctrl-names = "default";
@@ -194,6 +193,7 @@
status = "okay";
};
-&ehci1 {
- status = "okay";
+/* USB_X1 */
+&usb_x1_clk {
+ clock-frequency = <48000000>;
};
--
2.11.0
next prev parent reply other threads:[~2019-05-29 10:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-17 14:43 [PATCH/RFT] arm: dts: renesas: r7s9210-rza2mevb: sort nodes of rza2mevb board Yoshihiro Kaneko
2019-05-28 8:08 ` Geert Uytterhoeven
2019-05-29 10:22 ` Simon Horman [this message]
2019-05-29 10:32 ` Simon Horman
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=20190529102219.pkhwalbm6feaq4tz@verge.net.au \
--to=horms@verge.net.au \
--cc=geert@linux-m68k.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=ykaneko0929@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).