| Message ID | 1566219341-23048-1-git-send-email-ykaneko0929@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | arm64: dts: renesas: r8a774c0-cat874: sort nodes | expand |
On Mon, Aug 19, 2019 at 09:55:41PM +0900, Yoshihiro Kaneko wrote: > Sort nodes. > > If node address is present > * Sort by node address, grouping all nodes with the same compat string > and sorting the group alphabetically. > Else > * Sort alphabetically > > This should not have any run-time effect. > > Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Thanks Kaneko-san, I think that the i2c1_pins and hscif2_pins nodes are also out of order. I'm not sure if Geert would prefer you to respin or fix that himself. In any case, with that problem resolved: Reviewed-by: Simon Horman <horms+renesas@verge.net.au> > --- > > This patch is based on the master branch of Geert Uytterhoeven's renesas-devel > tree. > > arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts b/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts > index 651383c..aaa37158 100644 > --- a/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts > +++ b/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts > @@ -82,13 +82,13 @@ > simple-audio-card,bitclock-master = <&sndcpu>; > simple-audio-card,frame-master = <&sndcpu>; > > - sndcpu: simple-audio-card,cpu { > - sound-dai = <&rcar_sound>; > - }; > - > sndcodec: simple-audio-card,codec { > sound-dai = <&tda19988>; > }; > + > + sndcpu: simple-audio-card,cpu { > + sound-dai = <&rcar_sound>; > + }; > }; > > vcc_sdhi0: regulator-vcc-sdhi0 { > @@ -313,16 +313,16 @@ > power-source = <1800>; > }; > > - sound_pins: sound { > - groups = "ssi01239_ctrl", "ssi0_data"; > - function = "ssi"; > - }; > - > sound_clk_pins: sound_clk { > groups = "audio_clkout1_a"; > function = "audio_clk"; > }; > > + sound_pins: sound { > + groups = "ssi01239_ctrl", "ssi0_data"; > + function = "ssi"; > + }; > + > usb30_pins: usb30 { > groups = "usb30", "usb30_id"; > function = "usb30"; > -- > 1.9.1 >
On Mon, Aug 19, 2019 at 2:55 PM Yoshihiro Kaneko <ykaneko0929@gmail.com> wrote: > Sort nodes. > > If node address is present > * Sort by node address, grouping all nodes with the same compat string > and sorting the group alphabetically. > Else > * Sort alphabetically > > This should not have any run-time effect. > > Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> i.e. will queue in renesas-devel for v5.4. Gr{oetje,eeting}s, Geert
On Wed, Aug 21, 2019 at 10:41 AM Simon Horman <horms@verge.net.au> wrote: > On Mon, Aug 19, 2019 at 09:55:41PM +0900, Yoshihiro Kaneko wrote: > > Sort nodes. > > > > If node address is present > > * Sort by node address, grouping all nodes with the same compat string > > and sorting the group alphabetically. > > Else > > * Sort alphabetically > > > > This should not have any run-time effect. > > > > Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> > > Thanks Kaneko-san, > > I think that the i2c1_pins and hscif2_pins nodes > are also out of order. You're right. > I'm not sure if Geert would prefer you to respin or fix that himself. Will fix myself. > In any case, with that problem resolved: > > Reviewed-by: Simon Horman <horms+renesas@verge.net.au> Thanks! Gr{oetje,eeting}s, Geert
diff --git a/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts b/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts index 651383c..aaa37158 100644 --- a/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts +++ b/arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts @@ -82,13 +82,13 @@ simple-audio-card,bitclock-master = <&sndcpu>; simple-audio-card,frame-master = <&sndcpu>; - sndcpu: simple-audio-card,cpu { - sound-dai = <&rcar_sound>; - }; - sndcodec: simple-audio-card,codec { sound-dai = <&tda19988>; }; + + sndcpu: simple-audio-card,cpu { + sound-dai = <&rcar_sound>; + }; }; vcc_sdhi0: regulator-vcc-sdhi0 { @@ -313,16 +313,16 @@ power-source = <1800>; }; - sound_pins: sound { - groups = "ssi01239_ctrl", "ssi0_data"; - function = "ssi"; - }; - sound_clk_pins: sound_clk { groups = "audio_clkout1_a"; function = "audio_clk"; }; + sound_pins: sound { + groups = "ssi01239_ctrl", "ssi0_data"; + function = "ssi"; + }; + usb30_pins: usb30 { groups = "usb30", "usb30_id"; function = "usb30";
Sort nodes. If node address is present * Sort by node address, grouping all nodes with the same compat string and sorting the group alphabetically. Else * Sort alphabetically This should not have any run-time effect. Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> --- This patch is based on the master branch of Geert Uytterhoeven's renesas-devel tree. arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)