Commit 90a4ee4b authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

arm64: dts: renesas: salvator-x(s): Factor out SATA parts 



Move the common parts related to the SATA interface on Salvator-X(S)
boards to salvator-common.dtsi and salvator-xs.dtsi, to reduce current
and avoid future duplication of board descriptions.

As this interface is not present on all SoCs that can be found on
Salvator-X(S), but only on R-Car H3 and M3-N, its descriptions are
protected by the preprocessor symbol SOC_HAS_SATA, defined in
r8a77951.dtsi and r8a77965.dtsi.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://lore.kernel.org/r/87f91290ec7b523aa508e920a169ecaddccc9144.1623087028.git.geert+renesas@glider.be
parent 8fbb8c33

arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dts

+0 −4
Original line number Diff line number Diff line
@@ -63,10 +63,6 @@ 
	};

};



&sata {

	status = "okay";

};



&usb2_phy2 {

	pinctrl-0 = <&usb2_pins>;

	pinctrl-names = "default";

arch/arm64/boot/dts/renesas/r8a77951-salvator-x.dts

+0 −4
Original line number Diff line number Diff line
@@ -63,10 +63,6 @@ 
	};

};



&sata {

	status = "okay";

};



&usb2_phy2 {

	pinctrl-0 = <&usb2_pins>;

	pinctrl-names = "default";

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

+0 −14
Original line number Diff line number Diff line
@@ -71,15 +71,6 @@ 
	status = "okay";

};



&pca9654 {

	pcie-sata-switch-hog {

		gpio-hog;

		gpios = <7 GPIO_ACTIVE_HIGH>;

		output-low; /* enable SATA by default */

		line-name = "PCIE/SATA switch";

	};

};



&pfc {

	usb2_pins: usb2 {

		groups = "usb2";
@@ -104,11 +95,6 @@ 
	};

};



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

&sata {

	status = "okay";

};



&usb2_phy2 {

	pinctrl-0 = <&usb2_pins>;

	pinctrl-names = "default";

arch/arm64/boot/dts/renesas/r8a77951.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4



#define SOC_HAS_HDMI1

#define SOC_HAS_SATA



/ {

	compatible = "renesas,r8a7795";

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

+0 −14
Original line number Diff line number Diff line
@@ -30,17 +30,3 @@ 
	clock-names = "du.0", "du.1", "du.3",

		      "dclkin.0", "dclkin.1", "dclkin.3";

};
 


&pca9654 {

	pcie-sata-switch-hog {

		gpio-hog;

		gpios = <7 GPIO_ACTIVE_HIGH>;

		output-low; /* enable SATA by default */

		line-name = "PCIE/SATA switch";

	};

};



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

&sata {

	status = "okay";

};