[PATCH v1] arm64: dts: rockchip: Add sata2 node to rk356x

[PATCH v1] arm64: dts: rockchip: Add sata2 node to rk356x

[Frank Wunderlich]

From: Frank Wunderlich <frank-w@public-files.de>

RK356x supports up to 3 sata controllers which were compatible with the
existing snps,dwc-ahci binding.

My board has only sata2 connected to combphy2 so only add this one.

Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
---
 arch/arm64/boot/dts/rockchip/rk356x.dtsi | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
index 7cdef800cb3c..7b6c8a0c8b84 100644
--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
@@ -230,6 +230,21 @@ scmi_shmem: sram@0 {
 		};
 	};
 
+	sata2: sata@fc800000 {
+		compatible = "snps,dwc-ahci";
+		reg = <0 0xfc800000 0 0x1000>;
+		clocks = <&cru ACLK_SATA2>, <&cru CLK_SATA2_PMALIVE>,
+			 <&cru CLK_SATA2_RXOOB>;
+		clock-names = "sata", "pmalive", "rxoob";
+		interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "hostc";
+		phys = <&combphy2 PHY_TYPE_SATA>;
+		phy-names = "sata-phy";
+		ports-implemented = <0x1>;
+		power-domains = <&power RK3568_PD_PIPE>;
+		status = "disabled";
+	};
+
 	gic: interrupt-controller@fd400000 {
 		compatible = "arm,gic-v3";
 		reg = <0x0 0xfd400000 0 0x10000>, /* GICD */
-- 
2.25.1

Re: [PATCH v1] arm64: dts: rockchip: Add sata2 node to rk356x

[Heiko Stübner]

Hi Frank,

Am Samstag, 26. Februar 2022, 14:57:24 CET schrieb Frank Wunderlich:
> From: Frank Wunderlich <frank-w@public-files.de>
> 
> RK356x supports up to 3 sata controllers which were compatible with the
> existing snps,dwc-ahci binding.
> 
> My board has only sata2 connected to combphy2 so only add this one.

how far does the added node diverge from the vendor kernel?

If it's pretty much similar between both, we can assume the other nodes
should work pretty well as well and therefore should all of them at once
and hope for the best?

Thanks
Heiko

> Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
> ---
>  arch/arm64/boot/dts/rockchip/rk356x.dtsi | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
> index 7cdef800cb3c..7b6c8a0c8b84 100644
> --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
> @@ -230,6 +230,21 @@ scmi_shmem: sram@0 {
>  		};
>  	};
>  
> +	sata2: sata@fc800000 {
> +		compatible = "snps,dwc-ahci";
> +		reg = <0 0xfc800000 0 0x1000>;
> +		clocks = <&cru ACLK_SATA2>, <&cru CLK_SATA2_PMALIVE>,
> +			 <&cru CLK_SATA2_RXOOB>;
> +		clock-names = "sata", "pmalive", "rxoob";
> +		interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
> +		interrupt-names = "hostc";
> +		phys = <&combphy2 PHY_TYPE_SATA>;
> +		phy-names = "sata-phy";
> +		ports-implemented = <0x1>;
> +		power-domains = <&power RK3568_PD_PIPE>;
> +		status = "disabled";
> +	};
> +
>  	gic: interrupt-controller@fd400000 {
>  		compatible = "arm,gic-v3";
>  		reg = <0x0 0xfd400000 0 0x10000>, /* GICD */
> 

Re: [PATCH v1] arm64: dts: rockchip: Add sata2 node to rk356x

[Peter Geis]

On Sat, Feb 26, 2022 at 1:08 PM Heiko Stübner <heiko@sntech.de> wrote:
>
> Hi Frank,
>
> Am Samstag, 26. Februar 2022, 14:57:24 CET schrieb Frank Wunderlich:
> > From: Frank Wunderlich <frank-w@public-files.de>
> >
> > RK356x supports up to 3 sata controllers which were compatible with the
> > existing snps,dwc-ahci binding.
> >
> > My board has only sata2 connected to combphy2 so only add this one.
>
> how far does the added node diverge from the vendor kernel?
>
> If it's pretty much similar between both, we can assume the other nodes
> should work pretty well as well and therefore should all of them at once
> and hope for the best?

There's essentially zero divergence (minus the change due to combophy
changing), and likely won't be until the ahci-platform.txt is
converted to yaml.

I have tested both SATA1 and SATA2 successfully on the rk3566.
I don't have any rk3568 boards that are operational yet to test SATA0.

>
> Thanks
> Heiko
>
> > Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
> > ---
> >  arch/arm64/boot/dts/rockchip/rk356x.dtsi | 15 +++++++++++++++
> >  1 file changed, 15 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
> > index 7cdef800cb3c..7b6c8a0c8b84 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
> > +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
> > @@ -230,6 +230,21 @@ scmi_shmem: sram@0 {
> >               };
> >       };
> >
> > +     sata2: sata@fc800000 {
> > +             compatible = "snps,dwc-ahci";
> > +             reg = <0 0xfc800000 0 0x1000>;
> > +             clocks = <&cru ACLK_SATA2>, <&cru CLK_SATA2_PMALIVE>,
> > +                      <&cru CLK_SATA2_RXOOB>;
> > +             clock-names = "sata", "pmalive", "rxoob";
> > +             interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
> > +             interrupt-names = "hostc";
> > +             phys = <&combphy2 PHY_TYPE_SATA>;
> > +             phy-names = "sata-phy";
> > +             ports-implemented = <0x1>;
> > +             power-domains = <&power RK3568_PD_PIPE>;
> > +             status = "disabled";
> > +     };
> > +
> >       gic: interrupt-controller@fd400000 {
> >               compatible = "arm,gic-v3";
> >               reg = <0x0 0xfd400000 0 0x10000>, /* GICD */
> >
>
>
>
>

Aw: Re: [PATCH v1] arm64: dts: rockchip: Add sata2 node to rk356x

[Frank Wunderlich]

Hi

> Gesendet: Samstag, 26. Februar 2022 um 19:15 Uhr
> Von: "Peter Geis" <pgwipeout@gmail.com>
> On Sat, Feb 26, 2022 at 1:08 PM Heiko Stübner <heiko@sntech.de> wrote:
> >
> > Hi Frank,
> >
> > Am Samstag, 26. Februar 2022, 14:57:24 CET schrieb Frank Wunderlich:
> > > From: Frank Wunderlich <frank-w@public-files.de>
> > >
> > > RK356x supports up to 3 sata controllers which were compatible with the
> > > existing snps,dwc-ahci binding.
> > >
> > > My board has only sata2 connected to combphy2 so only add this one.
> >
> > how far does the added node diverge from the vendor kernel?
> >
> > If it's pretty much similar between both, we can assume the other nodes
> > should work pretty well as well and therefore should all of them at once
> > and hope for the best?
> 
> There's essentially zero divergence (minus the change due to combophy
> changing), and likely won't be until the ahci-platform.txt is
> converted to yaml.
> 
> I have tested both SATA1 and SATA2 successfully on the rk3566.
> I don't have any rk3568 boards that are operational yet to test SATA0.

Like Peter says, the sata-node(s) is basicly same as downstream, only combphy-label has changed.
Sata1 from Peters tree [1] seems to have only this change.
I'll send an followup containing all 3, but had only tested sata2.

already sent a bindings-patch for the ahci-platform.txt [2]

regards Frank

[1] https://gitlab.com/pgwipeout/linux-next/-/blob/main/arch/arm64/boot/dts/rockchip/rk356x.dtsi#L238
[2] https://lore.kernel.org/lkml/20220226204404.109867-1-linux@fw-web.de/T/