On Mon, Jul 30, 2018 at 09:34:56AM +0200, Wolfram Sang wrote:
> Add the nodes to enable SATA. Note that MD12 (SW12-7) must be switched
> off for that to work.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
> ---
>
> Changes since v1:
> * fixed indentation (Thanks, Geert!)
> * merged two patches into one (Thanks, Simon!)
> * Added Geert's tag
>
> arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 14 ++++++++++++++
> arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dts | 14 ++++++++++++++
> 2 files changed, 28 insertions(+)
This looks good to me:
Reviewed-by: Simon Horman <horms+renesas@xxxxxxxxxxxx>
But (note to self) depends on:
[PATCH v2] arm64: dts: r8a77965: Add SATA controller node
>
> diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
> index 8ded64d0a4d5..368be55eda4e 100644
> --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
> +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
> @@ -152,6 +152,15 @@
> };
> };
>
> +&pca9654 {
> + pcie_sata_switch {
> + gpio-hog;
> + gpios = <7 GPIO_ACTIVE_HIGH>;
> + output-low; /* enable SATA by default */
> + line-name = "PCIE/SATA switch";
> + };
> +};
> +
> &pfc {
> usb2_pins: usb2 {
> groups = "usb2";
> @@ -176,6 +185,11 @@
> };
> };
>
> +/* MD12 (SW12-7) must be set 'Off' which is not the default! */
> +&sata {
> + status = "okay";
> +};
> +
> &usb2_phy2 {
> pinctrl-0 = <&usb2_pins>;
> pinctrl-names = "default";
> diff --git a/arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dts
> index 9de4e3db1621..45016a06fab1 100644
> --- a/arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dts
> +++ b/arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dts
> @@ -47,3 +47,17 @@
> &hdmi0_con {
> remote-endpoint = <&rcar_dw_hdmi0_out>;
> };
> +
> +&pca9654 {
> + pcie_sata_switch {
> + gpio-hog;
> + gpios = <7 GPIO_ACTIVE_HIGH>;
> + output-low; /* enable SATA by default */
> + line-name = "PCIE/SATA switch";
> + };
> +};
> +
> +/* MD12 (SW12-7) must be set 'Off' which is not the default! */
> +&sata {
> + status = "okay";
> +};
> --
> 2.11.0
>
