| Message ID | 1563816141-17805-1-git-send-email-ykaneko0929@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 34e776ea894a063670d61d2e6f16795d84a3ccc1 |
| Headers | show |
| Series | arm64: dts: renesas: r8a7795-es1-salvator-x: sort nodes | expand |
On Tue, Jul 23, 2019 at 02:22:21AM +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> Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
On Mon, Jul 22, 2019 at 7:22 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
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts index c1a56ea..c729686 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts @@ -52,12 +52,6 @@ status = "okay"; }; -&sound_card { - dais = <&rsnd_port0 /* ak4613 */ - &rsnd_port1 /* HDMI0 */ - &rsnd_port2>; /* HDMI1 */ -}; - &hdmi0 { status = "okay"; @@ -108,6 +102,13 @@ status = "okay"; }; +&pfc { + usb2_pins: usb2 { + groups = "usb2"; + function = "usb2"; + }; +}; + &rcar_sound { ports { /* rsnd_port0 is on salvator-common */ @@ -138,17 +139,16 @@ }; }; -&pfc { - usb2_pins: usb2 { - groups = "usb2"; - function = "usb2"; - }; -}; - &sata { status = "okay"; }; +&sound_card { + dais = <&rsnd_port0 /* ak4613 */ + &rsnd_port1 /* HDMI0 */ + &rsnd_port2>; /* HDMI1 */ +}; + &usb2_phy2 { pinctrl-0 = <&usb2_pins>; pinctrl-names = "default";
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 devel branch of Simon Horman's renesas tree. .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-)