UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://lore.kernel.org/r/87f91290ec7b523aa508e920a169ecaddccc9144.1623087028.git.geert+renesas@glider.be
This commit is contained in:
Geert Uytterhoeven 2021-06-07 19:39:03 +02:00
parent 8fbb8c334f
commit 90a4ee4ba5
8 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dts
View File

@ -63,10 +63,6 @@
};
};
&sata {
status = "okay";
};
&usb2_phy2 {
pinctrl-0 = <&usb2_pins>;
pinctrl-names = "default";

4
arch/arm64/boot/dts/renesas/r8a77951-salvator-x.dts
View File

@ -63,10 +63,6 @@
};
};
&sata {
status = "okay";
};
&usb2_phy2 {
pinctrl-0 = <&usb2_pins>;
pinctrl-names = "default";

14
arch/arm64/boot/dts/renesas/r8a77951-salvator-xs.dts
View File

@ -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";

1
arch/arm64/boot/dts/renesas/r8a77951.dtsi
View File

@ -12,6 +12,7 @@
#define CPG_AUDIO_CLK_I R8A7795_CLK_S0D4
#define SOC_HAS_HDMI1
#define SOC_HAS_SATA
/ {
compatible = "renesas,r8a7795";

14
arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dts
View File

@ -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";
};

2
arch/arm64/boot/dts/renesas/r8a77965.dtsi
View File

@ -14,6 +14,8 @@
#define CPG_AUDIO_CLK_I R8A77965_CLK_S0D4
#define SOC_HAS_SATA
/ {
compatible = "renesas,r8a77965";
#address-cells = <2>;

6
arch/arm64/boot/dts/renesas/salvator-common.dtsi
View File

@ -870,6 +870,12 @@
status = "okay";
};
#ifdef SOC_HAS_SATA
&sata {
status = "okay";
};
#endif /* SOC_HAS_SATA */
&scif1 {
pinctrl-0 = <&scif1_pins>;
pinctrl-names = "default";

13
arch/arm64/boot/dts/renesas/salvator-xs.dtsi
View File

@ -27,3 +27,16 @@
clock-names = "xin";
};
};
#ifdef SOC_HAS_SATA
&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! */
#endif /* SOC_HAS_SATA */