Commit d18fb00d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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



Move the common parts related to the third USB2 interface on
Salvator-X(S) boards to salvator-common.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, its descriptions are protected by
the preprocessor symbol SOC_HAS_USB2_CH2, defined in r8a77951.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/ebc434502fc899b1f9d9640f560c3eaab6bb0927.1623087028.git.geert+renesas@glider.be
parent 90a4ee4b

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

+0 −22
Original line number Diff line number Diff line
@@ -47,25 +47,3 @@ 
	clock-names = "du.0", "du.1", "du.2", "du.3",

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

};
 


&ehci2 {

	status = "okay";

};



&ohci2 {

	status = "okay";

};



&pfc {

	usb2_pins: usb2 {

		groups = "usb2";

		function = "usb2";

	};

};



&usb2_phy2 {

	pinctrl-0 = <&usb2_pins>;

	pinctrl-names = "default";



	status = "okay";

};

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

+0 −22
Original line number Diff line number Diff line
@@ -47,25 +47,3 @@ 
	clock-names = "du.0", "du.1", "du.2", "du.3",

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

};
 


&ehci2 {

	status = "okay";

};



&ohci2 {

	status = "okay";

};



&pfc {

	usb2_pins: usb2 {

		groups = "usb2";

		function = "usb2";

	};

};



&usb2_phy2 {

	pinctrl-0 = <&usb2_pins>;

	pinctrl-names = "default";



	status = "okay";

};

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

+0 −20
Original line number Diff line number Diff line
@@ -48,10 +48,6 @@ 
		      "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";

};



&ehci2 {

	status = "okay";

};



&ehci3 {

	dr_mode = "otg";

	status = "okay";
@@ -62,21 +58,12 @@ 
	status = "okay";

};



&ohci2 {

	status = "okay";

};



&ohci3 {

	dr_mode = "otg";

	status = "okay";

};



&pfc {

	usb2_pins: usb2 {

		groups = "usb2";

		function = "usb2";

	};



	/*

	 * - On Salvator-X[S], GP6_3[01] are connected to ADV7482 as irq pins

	 *   (when SW31 is the default setting on Salvator-XS).
@@ -95,13 +82,6 @@ 
	};

};



&usb2_phy2 {

	pinctrl-0 = <&usb2_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&usb2_phy3 {

	pinctrl-0 = <&usb2_ch3_pins>;

	pinctrl-names = "default";

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

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#define SOC_HAS_HDMI1

#define SOC_HAS_SATA

#define SOC_HAS_USB2_CH2



/ {

	compatible = "renesas,r8a7795";

arch/arm64/boot/dts/renesas/salvator-common.dtsi

+24 −0
Original line number Diff line number Diff line
@@ -1023,3 +1023,27 @@ 


	status = "okay";

};



#ifdef SOC_HAS_USB2_CH2

&ehci2 {

	status = "okay";

};



&ohci2 {

	status = "okay";

};



&pfc {

	usb2_pins: usb2 {

		groups = "usb2";

		function = "usb2";

	};

};



&usb2_phy2 {

	pinctrl-0 = <&usb2_pins>;

	pinctrl-names = "default";



	status = "okay";

};

#endif /* SOC_HAS_USB2_CH2 */