[PATCH 0/2] RK3576 SATA Enablement

[PATCH 0/2] RK3576 SATA Enablement

[Nicolas Frattaroli]

This is a tiny series to enable SATA on RK3576. It consists of a patch
to add the compatible to the bindings, and a second patch to add the
nodes to the SoC .dtsi.

I've only been able to test sata0 on my board (Sige5), but the
successful test gave me confidence that downstream's "dma-coherent"
property here is appropriate and true.

Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
---
Nicolas Frattaroli (2):
      dt-bindings: ata: rockchip-dwc-ahci: add RK3576 compatible
      arm64: dts: rockchip: add SATA nodes to RK3576

 .../devicetree/bindings/ata/rockchip,dwc-ahci.yaml |  3 +++
 arch/arm64/boot/dts/rockchip/rk3576.dtsi           | 30 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)
---
base-commit: f34da179a4517854b2ffbe4bce8c3405bd9be04e
change-id: 20250424-rk3576-sata-b102b21e49a6

Best regards,
-- 
Nicolas Frattaroli <nicolas.frattaroli@collabora.com>

[PATCH 1/2] dt-bindings: ata: rockchip-dwc-ahci: add RK3576 compatible

[Nicolas Frattaroli]

The Rockchip RK3576 has two SATA controllers. They work the same as the
RK3568 SATA controllers, having the same number of clocks and ports.

Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
---
 Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml b/Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml
index 13eaa8d9a16e5a4bd43b3e184f9277494acf27a1..b5ecaabfe2e2537afe6093558fb0ab975dcf6058 100644
--- a/Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml
+++ b/Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml
@@ -20,6 +20,7 @@ select:
       contains:
         enum:
           - rockchip,rk3568-dwc-ahci
+          - rockchip,rk3576-dwc-ahci
           - rockchip,rk3588-dwc-ahci
   required:
     - compatible
@@ -29,6 +30,7 @@ properties:
     items:
       - enum:
           - rockchip,rk3568-dwc-ahci
+          - rockchip,rk3576-dwc-ahci
           - rockchip,rk3588-dwc-ahci
       - const: snps,dwc-ahci
 
@@ -83,6 +85,7 @@ allOf:
           contains:
             enum:
               - rockchip,rk3568-dwc-ahci
+              - rockchip,rk3576-dwc-ahci
     then:
       properties:
         clocks:

-- 
2.49.0

Re: [PATCH 1/2] dt-bindings: ata: rockchip-dwc-ahci: add RK3576 compatible

[Niklas Cassel]

On Thu, Apr 24, 2025 at 08:52:22PM +0200, Nicolas Frattaroli wrote:
> The Rockchip RK3576 has two SATA controllers. They work the same as the
> RK3568 SATA controllers, having the same number of clocks and ports.
> 
> Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
> ---
>  Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml b/Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml
> index 13eaa8d9a16e5a4bd43b3e184f9277494acf27a1..b5ecaabfe2e2537afe6093558fb0ab975dcf6058 100644
> --- a/Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml
> +++ b/Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml
> @@ -20,6 +20,7 @@ select:
>        contains:
>          enum:
>            - rockchip,rk3568-dwc-ahci
> +          - rockchip,rk3576-dwc-ahci
>            - rockchip,rk3588-dwc-ahci
>    required:
>      - compatible
> @@ -29,6 +30,7 @@ properties:
>      items:
>        - enum:
>            - rockchip,rk3568-dwc-ahci
> +          - rockchip,rk3576-dwc-ahci
>            - rockchip,rk3588-dwc-ahci
>        - const: snps,dwc-ahci
>  
> @@ -83,6 +85,7 @@ allOf:
>            contains:
>              enum:
>                - rockchip,rk3568-dwc-ahci
> +              - rockchip,rk3576-dwc-ahci
>      then:
>        properties:
>          clocks:
> 
> -- 
> 2.49.0
> 

Looks good to me:
Reviewed-by: Niklas Cassel <cassel@kernel.org>

Re: [PATCH 1/2] dt-bindings: ata: rockchip-dwc-ahci: add RK3576 compatible

[Krzysztof Kozlowski]

On Thu, Apr 24, 2025 at 08:52:22PM GMT, Nicolas Frattaroli wrote:
> The Rockchip RK3576 has two SATA controllers. They work the same as the
> RK3568 SATA controllers, having the same number of clocks and ports.
> 
> Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
> ---
>  Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml | 3 +++
>  1 file changed, 3 insertions(+)

Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

[PATCH 2/2] arm64: dts: rockchip: add SATA nodes to RK3576

[Nicolas Frattaroli]

The Rockchip RK3576 features two SATA nodes. The first, sata0, is behind
combphy0, which muxes between pcie0 and sata0.

The second, sata1, is behind combphy1, which muxes between pcie1, sata1
and usb_drd1_dwc3.

I've only been able to test sata0 on my board, but it appears to work
just fine.

Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
---
 arch/arm64/boot/dts/rockchip/rk3576.dtsi | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3576.dtsi b/arch/arm64/boot/dts/rockchip/rk3576.dtsi
index ebb5fc8bb8b1363127b9d3782801c4a79b678a92..6e27d744acad2111616eaf4807aea1eac4f00c7f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3576.dtsi
@@ -1334,6 +1334,36 @@ gmac1_mtl_tx_setup: tx-queues-config {
 			};
 		};
 
+		sata0: sata@2a240000 {
+			compatible = "rockchip,rk3576-dwc-ahci", "snps,dwc-ahci";
+			reg = <0x0 0x2a240000 0x0 0x1000>;
+			clocks = <&cru ACLK_SATA0>, <&cru CLK_PMALIVE0>,
+				 <&cru CLK_RXOOB0>;
+			clock-names = "sata", "pmalive", "rxoob";
+			interrupts = <GIC_SPI 262 IRQ_TYPE_LEVEL_HIGH>;
+			power-domains = <&power RK3576_PD_SUBPHP>;
+			phys = <&combphy0_ps PHY_TYPE_SATA>;
+			phy-names = "sata-phy";
+			ports-implemented = <0x1>;
+			dma-coherent;
+			status = "disabled";
+		};
+
+		sata1: sata@2a250000 {
+			compatible = "rockchip,rk3576-dwc-ahci", "snps,dwc-ahci";
+			reg = <0x0 0x2a250000 0x0 0x1000>;
+			clocks = <&cru ACLK_SATA1>, <&cru CLK_PMALIVE1>,
+				 <&cru CLK_RXOOB1>;
+			clock-names = "sata", "pmalive", "rxoob";
+			interrupts = <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>;
+			power-domains = <&power RK3576_PD_SUBPHP>;
+			phys = <&combphy1_psu PHY_TYPE_SATA>;
+			phy-names = "sata-phy";
+			ports-implemented = <0x1>;
+			dma-coherent;
+			status = "disabled";
+		};
+
 		ufshc: ufshc@2a2d0000 {
 			compatible = "rockchip,rk3576-ufshc";
 			reg = <0x0 0x2a2d0000 0x0 0x10000>,

-- 
2.49.0

Re: (subset) [PATCH 0/2] RK3576 SATA Enablement

[Niklas Cassel]

On Thu, 24 Apr 2025 20:52:21 +0200, Nicolas Frattaroli wrote:
> This is a tiny series to enable SATA on RK3576. It consists of a patch
> to add the compatible to the bindings, and a second patch to add the
> nodes to the SoC .dtsi.
> 
> I've only been able to test sata0 on my board (Sige5), but the
> successful test gave me confidence that downstream's "dma-coherent"
> property here is appropriate and true.
> 
> [...]

Applied to libata/linux.git (for-6.16), thanks!

[1/2] dt-bindings: ata: rockchip-dwc-ahci: add RK3576 compatible
      https://git.kernel.org/libata/linux/c/b8ed9475


I'm assuming that Heiko will pick up patch [2/2].


Kind regards,
Niklas

Re: (subset) [PATCH 0/2] RK3576 SATA Enablement

[Heiko Stuebner]

On Thu, 24 Apr 2025 20:52:21 +0200, Nicolas Frattaroli wrote:
> This is a tiny series to enable SATA on RK3576. It consists of a patch
> to add the compatible to the bindings, and a second patch to add the
> nodes to the SoC .dtsi.
> 
> I've only been able to test sata0 on my board (Sige5), but the
> successful test gave me confidence that downstream's "dma-coherent"
> property here is appropriate and true.
> 
> [...]

Applied, thanks!

[2/2] arm64: dts: rockchip: add SATA nodes to RK3576
      commit: 24d8127d801560c8fa811d554e8ab5db7e51511c

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>