Commit a23bc44c authored by Yoshihiro Kaneko's avatar Yoshihiro Kaneko Committed by Geert Uytterhoeven
Browse files

arm64: dts: renesas: r8a7795: salvator-xs: Sort nodes 



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: default avatarYoshihiro Kaneko <ykaneko0929@gmail.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent 480160ee

arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts

+41 −41
Original line number Diff line number Diff line
@@ -57,17 +57,6 @@ &ehci3 { 
	status = "okay";

};



&hsusb3 {

	dr_mode = "otg";

	status = "okay";

};



&sound_card {

	dais = <&rsnd_port0	/* ak4613 */

		&rsnd_port1	/* HDMI0  */

		&rsnd_port2>;	/* HDMI1  */

};



&hdmi0 {

	status = "okay";
@@ -114,6 +103,11 @@ &hdmi1_con { 
	remote-endpoint = <&rcar_dw_hdmi1_out>;

};



&hsusb3 {

	dr_mode = "otg";

	status = "okay";

};



&ohci2 {

	status = "okay";

};
@@ -123,36 +117,6 @@ &ohci3 { 
	status = "okay";

};



&rcar_sound {

	ports {

		/* rsnd_port0 is on salvator-common */

		rsnd_port1: port@1 {

			reg = <1>;

			rsnd_endpoint1: endpoint {

				remote-endpoint = <&dw_hdmi0_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint1>;

				frame-master = <&rsnd_endpoint1>;



				playback = <&ssi2>;

			};

		};

		rsnd_port2: port@2 {

			reg = <2>;

			rsnd_endpoint2: endpoint {

				remote-endpoint = <&dw_hdmi1_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint2>;

				frame-master = <&rsnd_endpoint2>;



				playback = <&ssi3>;

			};

		};

	};

};



&pca9654 {

	pcie_sata_switch {

		gpio-hog;
@@ -186,11 +150,47 @@ usb2_ch3_pins: usb2_ch3 { 
	};

};



&rcar_sound {

	ports {

		/* rsnd_port0 is on salvator-common */

		rsnd_port1: port@1 {

			reg = <1>;

			rsnd_endpoint1: endpoint {

				remote-endpoint = <&dw_hdmi0_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint1>;

				frame-master = <&rsnd_endpoint1>;



				playback = <&ssi2>;

			};

		};

		rsnd_port2: port@2 {

			reg = <2>;

			rsnd_endpoint2: endpoint {

				remote-endpoint = <&dw_hdmi1_snd_in>;



				dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint2>;

				frame-master = <&rsnd_endpoint2>;



				playback = <&ssi3>;

			};

		};

	};

};



/* SW12-7 must be set 'Off' (MD12 set to 1) which is not the default! */

&sata {

	status = "okay";

};



&sound_card {

	dais = <&rsnd_port0	/* ak4613 */

		&rsnd_port1	/* HDMI0  */

		&rsnd_port2>;	/* HDMI1  */

};



&usb2_phy2 {

	pinctrl-0 = <&usb2_pins>;

	pinctrl-names = "default";