[PATCH v2 0/5] arm64: dts: rockchip: add ROCK 5B+ support

[PATCH v2 0/5] arm64: dts: rockchip: add ROCK 5B+ support

[Sebastian Reichel]

This series adds support for the ROCK 5B+, which (as the name suggests)
is an improved version of the ROCK 5B. It also adds initial USB-C
support for both the ROCK 5B and the 5B+.

Changes in PATCHv2:
 - Link to v1: https://lore.kernel.org/r/20250324-rock5bp-for-upstream-v1-0-6217edf15b19@kernel.org
 - Replaced DT binding patch with the version from NAOKI
 - Dropped unused pinctrl for vcc5v0_host_en from the shared DT
 - Moved USB-C SBU DC pins to board specific files, since they differ
   between Rock 5B and Rock 5B+
 - Added pinmux for SBU DC pins
 - Rebased to latest version of Heiko's for-next branch
 - Disable USB-C on Rock 5B for now

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
FUKAUMI Naoki (1):
      dt-bindings: arm: rockchip: Add Radxa ROCK 5B+

Sebastian Reichel (4):
      arm64: dts: rockchip: move rock 5b to include file
      arm64: dts: rockchip: move rock 5b to include file
      arm64: dts: rockchip: add Rock 5B+
      arm64: dts: rockchip: add USB-C support for ROCK 5B+

 .../devicetree/bindings/arm/rockchip.yaml          |    5 +
 arch/arm64/boot/dts/rockchip/Makefile              |    1 +
 .../boot/dts/rockchip/rk3588-rock-5b-plus.dts      |  129 +++
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts    |  970 +-----------------
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi   | 1082 ++++++++++++++++++++
 5 files changed, 1247 insertions(+), 940 deletions(-)
---
base-commit: b7caeb9545db25649eda36ce593b70cc2aa804ab
change-id: 20250324-rock5bp-for-upstream-fd85b00b593b

Best regards,
-- 
Sebastian Reichel <sre@kernel.org>

[PATCH v2 1/5] arm64: dts: rockchip: move rock 5b to include file

[Sebastian Reichel]

Radxa released some more boards, which are based on the original
Rock 5B. Move its board description into an include file to avoid
unnecessary duplication.

NOTE: this should be merged with the following commit to ensure
bisectability. The rename happens in a separete commit during
development because git does not properly detect the rename when
the original filename is reused in the same commit. This means

1. it's a lot harder to review the changes
2. it's a lot harder to rebase the patch series

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 arch/arm64/boot/dts/rockchip/{rk3588-rock-5b.dts => rk3588-rock-5b.dtsi} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
rename to arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi

-- 
2.47.2

[PATCH v2 2/5] arm64: dts: rockchip: move rock 5b to include file

[Sebastian Reichel]

Radxa released some more boards, which are based on the original
Rock 5B. Move its board description into an include file to avoid
unnecessary duplication.

NOTE: this should be merged with the previous commit to ensure
bisectability. The rename happens in a separete commit during
development because git does not properly detect the rename when
the original filename is reused in the same commit. This means

1. it's a lot harder to review the changes
2. it's a lot harder to rebase the patch series

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts  | 52 ++++++++++++++++++++++++
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi | 40 ------------------
 2 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
new file mode 100644
index 0000000000000000000000000000000000000000..9407a7c9910ada1f6c803d2e15785a9cbd9bd655
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+/dts-v1/;
+
+#include "rk3588-rock-5b.dtsi"
+
+/ {
+	model = "Radxa ROCK 5B";
+	compatible = "radxa,rock-5b", "rockchip,rk3588";
+};
+
+&sdio {
+	max-frequency = <200000000>;
+	no-sd;
+	no-mmc;
+	non-removable;
+	bus-width = <4>;
+	cap-sdio-irq;
+	disable-wp;
+	keep-power-in-suspend;
+	wakeup-source;
+	sd-uhs-sdr12;
+	sd-uhs-sdr25;
+	sd-uhs-sdr50;
+	sd-uhs-sdr104;
+	vmmc-supply = <&vcc3v3_pcie2x1l0>;
+	vqmmc-supply = <&vcc_1v8_s3>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdiom0_pins>;
+	status = "okay";
+};
+
+&uart6 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>;
+	status = "okay";
+};
+
+&pinctrl {
+	usb {
+		vcc5v0_host_en: vcc5v0-host-en {
+			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+};
+
+&vcc5v0_host {
+	enable-active-high;
+	gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&vcc5v0_host_en>;
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
index 17f4fd054cd3d1c4e23ccfe014a9c4b9d7ad1a06..6052787d2560978d2bae6cfbeea5fc1d419d583a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
@@ -8,9 +8,6 @@
 #include "rk3588.dtsi"
 
 / {
-	model = "Radxa ROCK 5B";
-	compatible = "radxa,rock-5b", "rockchip,rk3588";
-
 	aliases {
 		mmc0 = &sdhci;
 		mmc1 = &sdmmc;
@@ -139,10 +136,6 @@ vcc5v0_host: regulator-vcc5v0-host {
 		regulator-always-on;
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
-		enable-active-high;
-		gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&vcc5v0_host_en>;
 		vin-supply = <&vcc5v0_sys>;
 	};
 
@@ -488,12 +481,6 @@ pcie3_vcc3v3_en: pcie3-vcc3v3-en {
 			rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
-
-	usb {
-		vcc5v0_host_en: vcc5v0-host-en {
-			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
 };
 
 &pwm1 {
@@ -530,27 +517,6 @@ &sdmmc {
 	status = "okay";
 };
 
-&sdio {
-	max-frequency = <200000000>;
-	no-sd;
-	no-mmc;
-	non-removable;
-	bus-width = <4>;
-	cap-sdio-irq;
-	disable-wp;
-	keep-power-in-suspend;
-	wakeup-source;
-	sd-uhs-sdr12;
-	sd-uhs-sdr25;
-	sd-uhs-sdr50;
-	sd-uhs-sdr104;
-	vmmc-supply = <&vcc3v3_pcie2x1l0>;
-	vqmmc-supply = <&vcc_1v8_s3>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&sdiom0_pins>;
-	status = "okay";
-};
-
 &sfc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&fspim2_pins>;
@@ -566,12 +532,6 @@ flash@0 {
 	};
 };
 
-&uart6 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>;
-	status = "okay";
-};
-
 &spi2 {
 	status = "okay";
 	assigned-clocks = <&cru CLK_SPI2>;

-- 
2.47.2

Re: [PATCH v2 2/5] arm64: dts: rockchip: move rock 5b to include file

[Diederik de Haas]

[-- Attachment #1: Type: text/plain, Size: 4817 bytes --]

Hi,

On Thu May 8, 2025 at 7:48 PM CEST, Sebastian Reichel wrote:
> Radxa released some more boards, which are based on the original
> Rock 5B. Move its board description into an include file to avoid
> unnecessary duplication.

Aren't you moving it *out of* an/the include file?
If so, the patch Subject and the above line should be updated so that
they correctly reflect what is changed in this patch.

The above text is correct (and the same ...) as patch 1, but in this
patch you move things out of the dtsi which are unique per board.

> NOTE: this should be merged with the previous commit to ensure
> bisectability. The rename happens in a separete commit during
> development because git does not properly detect the rename when
> the original filename is reused in the same commit. This means
>
> 1. it's a lot harder to review the changes
> 2. it's a lot harder to rebase the patch series

Or did I fall prey to the exact thing you described here?

Cheers,
  Diederik

> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> ---
>  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts  | 52 ++++++++++++++++++++++++
>  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi | 40 ------------------
>  2 files changed, 52 insertions(+), 40 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> new file mode 100644
> index 0000000000000000000000000000000000000000..9407a7c9910ada1f6c803d2e15785a9cbd9bd655
> --- /dev/null
> +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> @@ -0,0 +1,52 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +
> +/dts-v1/;
> +
> +#include "rk3588-rock-5b.dtsi"
> +
> +/ {
> +	model = "Radxa ROCK 5B";
> +	compatible = "radxa,rock-5b", "rockchip,rk3588";
> +};
> +
> +&sdio {
> +	max-frequency = <200000000>;
> +	no-sd;
> +	no-mmc;
> +	non-removable;
> +	bus-width = <4>;
> +	cap-sdio-irq;
> +	disable-wp;
> +	keep-power-in-suspend;
> +	wakeup-source;
> +	sd-uhs-sdr12;
> +	sd-uhs-sdr25;
> +	sd-uhs-sdr50;
> +	sd-uhs-sdr104;
> +	vmmc-supply = <&vcc3v3_pcie2x1l0>;
> +	vqmmc-supply = <&vcc_1v8_s3>;
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&sdiom0_pins>;
> +	status = "okay";
> +};
> +
> +&uart6 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>;
> +	status = "okay";
> +};
> +
> +&pinctrl {
> +	usb {
> +		vcc5v0_host_en: vcc5v0-host-en {
> +			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
> +		};
> +	};
> +};
> +
> +&vcc5v0_host {
> +	enable-active-high;
> +	gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&vcc5v0_host_en>;
> +};
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
> index 17f4fd054cd3d1c4e23ccfe014a9c4b9d7ad1a06..6052787d2560978d2bae6cfbeea5fc1d419d583a 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
> @@ -8,9 +8,6 @@
>  #include "rk3588.dtsi"
>  
>  / {
> -	model = "Radxa ROCK 5B";
> -	compatible = "radxa,rock-5b", "rockchip,rk3588";
> -
>  	aliases {
>  		mmc0 = &sdhci;
>  		mmc1 = &sdmmc;
> @@ -139,10 +136,6 @@ vcc5v0_host: regulator-vcc5v0-host {
>  		regulator-always-on;
>  		regulator-min-microvolt = <5000000>;
>  		regulator-max-microvolt = <5000000>;
> -		enable-active-high;
> -		gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&vcc5v0_host_en>;
>  		vin-supply = <&vcc5v0_sys>;
>  	};
>  
> @@ -488,12 +481,6 @@ pcie3_vcc3v3_en: pcie3-vcc3v3-en {
>  			rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
>  		};
>  	};
> -
> -	usb {
> -		vcc5v0_host_en: vcc5v0-host-en {
> -			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -	};
>  };
>  
>  &pwm1 {
> @@ -530,27 +517,6 @@ &sdmmc {
>  	status = "okay";
>  };
>  
> -&sdio {
> -	max-frequency = <200000000>;
> -	no-sd;
> -	no-mmc;
> -	non-removable;
> -	bus-width = <4>;
> -	cap-sdio-irq;
> -	disable-wp;
> -	keep-power-in-suspend;
> -	wakeup-source;
> -	sd-uhs-sdr12;
> -	sd-uhs-sdr25;
> -	sd-uhs-sdr50;
> -	sd-uhs-sdr104;
> -	vmmc-supply = <&vcc3v3_pcie2x1l0>;
> -	vqmmc-supply = <&vcc_1v8_s3>;
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&sdiom0_pins>;
> -	status = "okay";
> -};
> -
>  &sfc {
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&fspim2_pins>;
> @@ -566,12 +532,6 @@ flash@0 {
>  	};
>  };
>  
> -&uart6 {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>;
> -	status = "okay";
> -};
> -
>  &spi2 {
>  	status = "okay";
>  	assigned-clocks = <&cru CLK_SPI2>;


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v2 2/5] arm64: dts: rockchip: move rock 5b to include file

[Heiko Stübner]

Am Freitag, 9. Mai 2025, 14:44:57 Mitteleuropäische Sommerzeit schrieb Diederik de Haas:
> Hi,
> 
> On Thu May 8, 2025 at 7:48 PM CEST, Sebastian Reichel wrote:
> > Radxa released some more boards, which are based on the original
> > Rock 5B. Move its board description into an include file to avoid
> > unnecessary duplication.
> 
> Aren't you moving it *out of* an/the include file?
> If so, the patch Subject and the above line should be updated so that
> they correctly reflect what is changed in this patch.
> 
> The above text is correct (and the same ...) as patch 1, but in this
> patch you move things out of the dtsi which are unique per board.
> 
> > NOTE: this should be merged with the previous commit to ensure
> > bisectability. The rename happens in a separete commit during
> > development because git does not properly detect the rename when
> > the original filename is reused in the same commit. This means
> >
> > 1. it's a lot harder to review the changes
> > 2. it's a lot harder to rebase the patch series
> 
> Or did I fall prey to the exact thing you described here?

I think Sebastian's idea  is, that I squash both patches when applying.
This split makes it easy(er) to review because patch1 is just a rename.

And merging them when applying then makes it again not break bisectability.


Heiko


> Cheers,
>   Diederik
> 
> > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> > ---
> >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts  | 52 ++++++++++++++++++++++++
> >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi | 40 ------------------
> >  2 files changed, 52 insertions(+), 40 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> > new file mode 100644
> > index 0000000000000000000000000000000000000000..9407a7c9910ada1f6c803d2e15785a9cbd9bd655
> > --- /dev/null
> > +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> > @@ -0,0 +1,52 @@
> > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> > +
> > +/dts-v1/;
> > +
> > +#include "rk3588-rock-5b.dtsi"
> > +
> > +/ {
> > +	model = "Radxa ROCK 5B";
> > +	compatible = "radxa,rock-5b", "rockchip,rk3588";
> > +};
> > +
> > +&sdio {
> > +	max-frequency = <200000000>;
> > +	no-sd;
> > +	no-mmc;
> > +	non-removable;
> > +	bus-width = <4>;
> > +	cap-sdio-irq;
> > +	disable-wp;
> > +	keep-power-in-suspend;
> > +	wakeup-source;
> > +	sd-uhs-sdr12;
> > +	sd-uhs-sdr25;
> > +	sd-uhs-sdr50;
> > +	sd-uhs-sdr104;
> > +	vmmc-supply = <&vcc3v3_pcie2x1l0>;
> > +	vqmmc-supply = <&vcc_1v8_s3>;
> > +	pinctrl-names = "default";
> > +	pinctrl-0 = <&sdiom0_pins>;
> > +	status = "okay";
> > +};
> > +
> > +&uart6 {
> > +	pinctrl-names = "default";
> > +	pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>;
> > +	status = "okay";
> > +};
> > +
> > +&pinctrl {
> > +	usb {
> > +		vcc5v0_host_en: vcc5v0-host-en {
> > +			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
> > +		};
> > +	};
> > +};
> > +
> > +&vcc5v0_host {
> > +	enable-active-high;
> > +	gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
> > +	pinctrl-names = "default";
> > +	pinctrl-0 = <&vcc5v0_host_en>;
> > +};
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
> > index 17f4fd054cd3d1c4e23ccfe014a9c4b9d7ad1a06..6052787d2560978d2bae6cfbeea5fc1d419d583a 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
> > +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
> > @@ -8,9 +8,6 @@
> >  #include "rk3588.dtsi"
> >  
> >  / {
> > -	model = "Radxa ROCK 5B";
> > -	compatible = "radxa,rock-5b", "rockchip,rk3588";
> > -
> >  	aliases {
> >  		mmc0 = &sdhci;
> >  		mmc1 = &sdmmc;
> > @@ -139,10 +136,6 @@ vcc5v0_host: regulator-vcc5v0-host {
> >  		regulator-always-on;
> >  		regulator-min-microvolt = <5000000>;
> >  		regulator-max-microvolt = <5000000>;
> > -		enable-active-high;
> > -		gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
> > -		pinctrl-names = "default";
> > -		pinctrl-0 = <&vcc5v0_host_en>;
> >  		vin-supply = <&vcc5v0_sys>;
> >  	};
> >  
> > @@ -488,12 +481,6 @@ pcie3_vcc3v3_en: pcie3-vcc3v3-en {
> >  			rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
> >  		};
> >  	};
> > -
> > -	usb {
> > -		vcc5v0_host_en: vcc5v0-host-en {
> > -			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
> > -		};
> > -	};
> >  };
> >  
> >  &pwm1 {
> > @@ -530,27 +517,6 @@ &sdmmc {
> >  	status = "okay";
> >  };
> >  
> > -&sdio {
> > -	max-frequency = <200000000>;
> > -	no-sd;
> > -	no-mmc;
> > -	non-removable;
> > -	bus-width = <4>;
> > -	cap-sdio-irq;
> > -	disable-wp;
> > -	keep-power-in-suspend;
> > -	wakeup-source;
> > -	sd-uhs-sdr12;
> > -	sd-uhs-sdr25;
> > -	sd-uhs-sdr50;
> > -	sd-uhs-sdr104;
> > -	vmmc-supply = <&vcc3v3_pcie2x1l0>;
> > -	vqmmc-supply = <&vcc_1v8_s3>;
> > -	pinctrl-names = "default";
> > -	pinctrl-0 = <&sdiom0_pins>;
> > -	status = "okay";
> > -};
> > -
> >  &sfc {
> >  	pinctrl-names = "default";
> >  	pinctrl-0 = <&fspim2_pins>;
> > @@ -566,12 +532,6 @@ flash@0 {
> >  	};
> >  };
> >  
> > -&uart6 {
> > -	pinctrl-names = "default";
> > -	pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>;
> > -	status = "okay";
> > -};
> > -
> >  &spi2 {
> >  	status = "okay";
> >  	assigned-clocks = <&cru CLK_SPI2>;
> 
> 

Re: [PATCH v2 2/5] arm64: dts: rockchip: move rock 5b to include file

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 6517 bytes --]

Hi,

On Fri, May 09, 2025 at 02:54:00PM +0200, Heiko Stübner wrote:
> Am Freitag, 9. Mai 2025, 14:44:57 Mitteleuropäische Sommerzeit schrieb Diederik de Haas:
> > Hi,
> > 
> > On Thu May 8, 2025 at 7:48 PM CEST, Sebastian Reichel wrote:
> > > Radxa released some more boards, which are based on the original
> > > Rock 5B. Move its board description into an include file to avoid
> > > unnecessary duplication.
> > 
> > Aren't you moving it *out of* an/the include file?
> > If so, the patch Subject and the above line should be updated so that
> > they correctly reflect what is changed in this patch.
> > 
> > The above text is correct (and the same ...) as patch 1, but in this
> > patch you move things out of the dtsi which are unique per board.
> > 
> > > NOTE: this should be merged with the previous commit to ensure
> > > bisectability. The rename happens in a separete commit during
> > > development because git does not properly detect the rename when
> > > the original filename is reused in the same commit. This means
> > >
> > > 1. it's a lot harder to review the changes
> > > 2. it's a lot harder to rebase the patch series
> > 
> > Or did I fall prey to the exact thing you described here?
> 
> I think Sebastian's idea  is, that I squash both patches when applying.
> This split makes it easy(er) to review because patch1 is just a rename.
> 
> And merging them when applying then makes it again not break bisectability.

Correct. This is a lot easier to review than what git generates when
having these two patches squashed together, which is a huge diff of
all 1000+ lines in the file (I tried really hard to convince it that
this is mostly a rename with --find-renames and --find-copies). You
can see this kind of mess in patch 2 of the ROCK 5T series that
Nicolas just send (I will comment on that and suggest to do the same
thing I did to ease review. In his case it should even be possible
to do it in a bisectable way without needing a squash :)).

Greetings,

-- Sebastian

> 
> 
> Heiko
> 
> 
> > Cheers,
> >   Diederik
> > 
> > > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> > > ---
> > >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts  | 52 ++++++++++++++++++++++++
> > >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi | 40 ------------------
> > >  2 files changed, 52 insertions(+), 40 deletions(-)
> > >
> > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> > > new file mode 100644
> > > index 0000000000000000000000000000000000000000..9407a7c9910ada1f6c803d2e15785a9cbd9bd655
> > > --- /dev/null
> > > +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> > > @@ -0,0 +1,52 @@
> > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> > > +
> > > +/dts-v1/;
> > > +
> > > +#include "rk3588-rock-5b.dtsi"
> > > +
> > > +/ {
> > > +	model = "Radxa ROCK 5B";
> > > +	compatible = "radxa,rock-5b", "rockchip,rk3588";
> > > +};
> > > +
> > > +&sdio {
> > > +	max-frequency = <200000000>;
> > > +	no-sd;
> > > +	no-mmc;
> > > +	non-removable;
> > > +	bus-width = <4>;
> > > +	cap-sdio-irq;
> > > +	disable-wp;
> > > +	keep-power-in-suspend;
> > > +	wakeup-source;
> > > +	sd-uhs-sdr12;
> > > +	sd-uhs-sdr25;
> > > +	sd-uhs-sdr50;
> > > +	sd-uhs-sdr104;
> > > +	vmmc-supply = <&vcc3v3_pcie2x1l0>;
> > > +	vqmmc-supply = <&vcc_1v8_s3>;
> > > +	pinctrl-names = "default";
> > > +	pinctrl-0 = <&sdiom0_pins>;
> > > +	status = "okay";
> > > +};
> > > +
> > > +&uart6 {
> > > +	pinctrl-names = "default";
> > > +	pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>;
> > > +	status = "okay";
> > > +};
> > > +
> > > +&pinctrl {
> > > +	usb {
> > > +		vcc5v0_host_en: vcc5v0-host-en {
> > > +			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
> > > +		};
> > > +	};
> > > +};
> > > +
> > > +&vcc5v0_host {
> > > +	enable-active-high;
> > > +	gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
> > > +	pinctrl-names = "default";
> > > +	pinctrl-0 = <&vcc5v0_host_en>;
> > > +};
> > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
> > > index 17f4fd054cd3d1c4e23ccfe014a9c4b9d7ad1a06..6052787d2560978d2bae6cfbeea5fc1d419d583a 100644
> > > --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
> > > +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
> > > @@ -8,9 +8,6 @@
> > >  #include "rk3588.dtsi"
> > >  
> > >  / {
> > > -	model = "Radxa ROCK 5B";
> > > -	compatible = "radxa,rock-5b", "rockchip,rk3588";
> > > -
> > >  	aliases {
> > >  		mmc0 = &sdhci;
> > >  		mmc1 = &sdmmc;
> > > @@ -139,10 +136,6 @@ vcc5v0_host: regulator-vcc5v0-host {
> > >  		regulator-always-on;
> > >  		regulator-min-microvolt = <5000000>;
> > >  		regulator-max-microvolt = <5000000>;
> > > -		enable-active-high;
> > > -		gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
> > > -		pinctrl-names = "default";
> > > -		pinctrl-0 = <&vcc5v0_host_en>;
> > >  		vin-supply = <&vcc5v0_sys>;
> > >  	};
> > >  
> > > @@ -488,12 +481,6 @@ pcie3_vcc3v3_en: pcie3-vcc3v3-en {
> > >  			rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
> > >  		};
> > >  	};
> > > -
> > > -	usb {
> > > -		vcc5v0_host_en: vcc5v0-host-en {
> > > -			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
> > > -		};
> > > -	};
> > >  };
> > >  
> > >  &pwm1 {
> > > @@ -530,27 +517,6 @@ &sdmmc {
> > >  	status = "okay";
> > >  };
> > >  
> > > -&sdio {
> > > -	max-frequency = <200000000>;
> > > -	no-sd;
> > > -	no-mmc;
> > > -	non-removable;
> > > -	bus-width = <4>;
> > > -	cap-sdio-irq;
> > > -	disable-wp;
> > > -	keep-power-in-suspend;
> > > -	wakeup-source;
> > > -	sd-uhs-sdr12;
> > > -	sd-uhs-sdr25;
> > > -	sd-uhs-sdr50;
> > > -	sd-uhs-sdr104;
> > > -	vmmc-supply = <&vcc3v3_pcie2x1l0>;
> > > -	vqmmc-supply = <&vcc_1v8_s3>;
> > > -	pinctrl-names = "default";
> > > -	pinctrl-0 = <&sdiom0_pins>;
> > > -	status = "okay";
> > > -};
> > > -
> > >  &sfc {
> > >  	pinctrl-names = "default";
> > >  	pinctrl-0 = <&fspim2_pins>;
> > > @@ -566,12 +532,6 @@ flash@0 {
> > >  	};
> > >  };
> > >  
> > > -&uart6 {
> > > -	pinctrl-names = "default";
> > > -	pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>;
> > > -	status = "okay";
> > > -};
> > > -
> > >  &spi2 {
> > >  	status = "okay";
> > >  	assigned-clocks = <&cru CLK_SPI2>;
> > 
> > 
> 
> 
> 
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v2 2/5] arm64: dts: rockchip: move rock 5b to include file

[Diederik de Haas]

[-- Attachment #1: Type: text/plain, Size: 6740 bytes --]

Hi,

On Fri May 9, 2025 at 3:08 PM CEST, Sebastian Reichel wrote:
> On Fri, May 09, 2025 at 02:54:00PM +0200, Heiko Stübner wrote:
>> Am Freitag, 9. Mai 2025, 14:44:57 Mitteleuropäische Sommerzeit schrieb Diederik de Haas:
>> > On Thu May 8, 2025 at 7:48 PM CEST, Sebastian Reichel wrote:
>> > > Radxa released some more boards, which are based on the original
>> > > Rock 5B. Move its board description into an include file to avoid
>> > > unnecessary duplication.
>> > 
>> > Aren't you moving it *out of* an/the include file?
>> > If so, the patch Subject and the above line should be updated so that
>> > they correctly reflect what is changed in this patch.
>> > 
>> > The above text is correct (and the same ...) as patch 1, but in this
>> > patch you move things out of the dtsi which are unique per board.
>> > 
>> > > NOTE: this should be merged with the previous commit to ensure
>> > > bisectability. The rename happens in a separete commit during
>> > > development because git does not properly detect the rename when
>> > > the original filename is reused in the same commit. This means
>> > >
>> > > 1. it's a lot harder to review the changes
>> > > 2. it's a lot harder to rebase the patch series
>> > 
>> > Or did I fall prey to the exact thing you described here?
>> 
>> I think Sebastian's idea  is, that I squash both patches when applying.
>> This split makes it easy(er) to review because patch1 is just a rename.
>> 
>> And merging them when applying then makes it again not break bisectability.
>
> Correct. This is a lot easier to review than what git generates when
> having these two patches squashed together, which is a huge diff of
> all 1000+ lines in the file (I tried really hard to convince it that
> this is mostly a rename with --find-renames and --find-copies). You
> can see this kind of mess in patch 2 of the ROCK 5T series that
> Nicolas just send (I will comment on that and suggest to do the same
> thing I did to ease review. In his case it should even be possible
> to do it in a bisectable way without needing a squash :)).

Thank you both for the clarification :-)

Cheers,
  Diederik

>> > > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
>> > > ---
>> > >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts  | 52 ++++++++++++++++++++++++
>> > >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi | 40 ------------------
>> > >  2 files changed, 52 insertions(+), 40 deletions(-)
>> > >
>> > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
>> > > new file mode 100644
>> > > index 0000000000000000000000000000000000000000..9407a7c9910ada1f6c803d2e15785a9cbd9bd655
>> > > --- /dev/null
>> > > +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
>> > > @@ -0,0 +1,52 @@
>> > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>> > > +
>> > > +/dts-v1/;
>> > > +
>> > > +#include "rk3588-rock-5b.dtsi"
>> > > +
>> > > +/ {
>> > > +	model = "Radxa ROCK 5B";
>> > > +	compatible = "radxa,rock-5b", "rockchip,rk3588";
>> > > +};
>> > > +
>> > > +&sdio {
>> > > +	max-frequency = <200000000>;
>> > > +	no-sd;
>> > > +	no-mmc;
>> > > +	non-removable;
>> > > +	bus-width = <4>;
>> > > +	cap-sdio-irq;
>> > > +	disable-wp;
>> > > +	keep-power-in-suspend;
>> > > +	wakeup-source;
>> > > +	sd-uhs-sdr12;
>> > > +	sd-uhs-sdr25;
>> > > +	sd-uhs-sdr50;
>> > > +	sd-uhs-sdr104;
>> > > +	vmmc-supply = <&vcc3v3_pcie2x1l0>;
>> > > +	vqmmc-supply = <&vcc_1v8_s3>;
>> > > +	pinctrl-names = "default";
>> > > +	pinctrl-0 = <&sdiom0_pins>;
>> > > +	status = "okay";
>> > > +};
>> > > +
>> > > +&uart6 {
>> > > +	pinctrl-names = "default";
>> > > +	pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>;
>> > > +	status = "okay";
>> > > +};
>> > > +
>> > > +&pinctrl {
>> > > +	usb {
>> > > +		vcc5v0_host_en: vcc5v0-host-en {
>> > > +			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
>> > > +		};
>> > > +	};
>> > > +};
>> > > +
>> > > +&vcc5v0_host {
>> > > +	enable-active-high;
>> > > +	gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
>> > > +	pinctrl-names = "default";
>> > > +	pinctrl-0 = <&vcc5v0_host_en>;
>> > > +};
>> > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
>> > > index 17f4fd054cd3d1c4e23ccfe014a9c4b9d7ad1a06..6052787d2560978d2bae6cfbeea5fc1d419d583a 100644
>> > > --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
>> > > +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
>> > > @@ -8,9 +8,6 @@
>> > >  #include "rk3588.dtsi"
>> > >  
>> > >  / {
>> > > -	model = "Radxa ROCK 5B";
>> > > -	compatible = "radxa,rock-5b", "rockchip,rk3588";
>> > > -
>> > >  	aliases {
>> > >  		mmc0 = &sdhci;
>> > >  		mmc1 = &sdmmc;
>> > > @@ -139,10 +136,6 @@ vcc5v0_host: regulator-vcc5v0-host {
>> > >  		regulator-always-on;
>> > >  		regulator-min-microvolt = <5000000>;
>> > >  		regulator-max-microvolt = <5000000>;
>> > > -		enable-active-high;
>> > > -		gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
>> > > -		pinctrl-names = "default";
>> > > -		pinctrl-0 = <&vcc5v0_host_en>;
>> > >  		vin-supply = <&vcc5v0_sys>;
>> > >  	};
>> > >  
>> > > @@ -488,12 +481,6 @@ pcie3_vcc3v3_en: pcie3-vcc3v3-en {
>> > >  			rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
>> > >  		};
>> > >  	};
>> > > -
>> > > -	usb {
>> > > -		vcc5v0_host_en: vcc5v0-host-en {
>> > > -			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
>> > > -		};
>> > > -	};
>> > >  };
>> > >  
>> > >  &pwm1 {
>> > > @@ -530,27 +517,6 @@ &sdmmc {
>> > >  	status = "okay";
>> > >  };
>> > >  
>> > > -&sdio {
>> > > -	max-frequency = <200000000>;
>> > > -	no-sd;
>> > > -	no-mmc;
>> > > -	non-removable;
>> > > -	bus-width = <4>;
>> > > -	cap-sdio-irq;
>> > > -	disable-wp;
>> > > -	keep-power-in-suspend;
>> > > -	wakeup-source;
>> > > -	sd-uhs-sdr12;
>> > > -	sd-uhs-sdr25;
>> > > -	sd-uhs-sdr50;
>> > > -	sd-uhs-sdr104;
>> > > -	vmmc-supply = <&vcc3v3_pcie2x1l0>;
>> > > -	vqmmc-supply = <&vcc_1v8_s3>;
>> > > -	pinctrl-names = "default";
>> > > -	pinctrl-0 = <&sdiom0_pins>;
>> > > -	status = "okay";
>> > > -};
>> > > -
>> > >  &sfc {
>> > >  	pinctrl-names = "default";
>> > >  	pinctrl-0 = <&fspim2_pins>;
>> > > @@ -566,12 +532,6 @@ flash@0 {
>> > >  	};
>> > >  };
>> > >  
>> > > -&uart6 {
>> > > -	pinctrl-names = "default";
>> > > -	pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>;
>> > > -	status = "okay";
>> > > -};
>> > > -
>> > >  &spi2 {
>> > >  	status = "okay";
>> > >  	assigned-clocks = <&cru CLK_SPI2>;
>> > 
>> > 
>> 
>> 
>> 
>> 


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[PATCH v2 3/5] dt-bindings: arm: rockchip: Add Radxa ROCK 5B+

[Sebastian Reichel]

From: FUKAUMI Naoki <naoki@radxa.com>

The Radxa ROCK 5B+ is an improved version of the ROCK 5B.

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index 455fbb290b777bca5ae69ca8644bc41380b94272..8f324417a3bdb3f5e11b03c86d18df4b6f60a43c 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -946,6 +946,11 @@ properties:
           - const: radxa,rock-5b
           - const: rockchip,rk3588
 
+      - description: Radxa ROCK 5B+
+        items:
+          - const: radxa,rock-5b-plus
+          - const: rockchip,rk3588
+
       - description: Radxa ROCK 5C
         items:
           - const: radxa,rock-5c

-- 
2.47.2

[PATCH v2 4/5] arm64: dts: rockchip: add Rock 5B+

[Sebastian Reichel]

Add ROCK 5B+, which is an improved version of the ROCK 5B with the
following changes:

 * Memory LPDDR4X -> LPDDR5
 * HDMI input connector size
 * eMMC socket -> onboard
 * M.2 E-Key is replaced by onboard RTL8852BE WLAN/BT
 * M.2 M-Key 1x4 lanes is replaced by 2x2 lanes
 * Added M.2 B-Key for USB connected WWAN modules (untested)
 * Add second camera port (not yet supported in upstream Linux)
 * Add dedicated USB-C port for device power (no impact in DT;
   the existing port has not been changed and the new port is
   handled by CH224D standalone chip)

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 arch/arm64/boot/dts/rockchip/Makefile              |   1 +
 .../boot/dts/rockchip/rk3588-rock-5b-plus.dts      | 113 +++++++++++++++++++++
 2 files changed, 114 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index 7948522cb225cbbe54099fb7537fc70357164f13..7a05bd885d5ecb96c3decbd3f483a6c58b81e0ab 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -165,6 +165,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5-itx.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b-pcie-ep.dtbo
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b-pcie-srns.dtbo
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b-plus.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-tiger-haikou.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-tiger-haikou-video-demo.dtbo
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-toybrick-x0.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts
new file mode 100644
index 0000000000000000000000000000000000000000..74c7b6502e4dda4b774f43c704ebaee350703c0d
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts
@@ -0,0 +1,113 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+/dts-v1/;
+
+#include "rk3588-rock-5b.dtsi"
+
+/ {
+	model = "Radxa ROCK 5B+";
+	compatible = "radxa,rock-5b-plus", "rockchip,rk3588";
+
+	rfkill-wwan {
+		compatible = "rfkill-gpio";
+		label = "rfkill-m2-wwan";
+		radio-type = "wwan";
+		shutdown-gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;
+	};
+
+	vcc3v3_4g: regulator-vcc3v3-4g {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
+		/* pinctrl for the GPIO is requested by vcc3v3_pcie2x1l0 */
+		regulator-name = "vcc3v3_4g";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		startup-delay-us = <50000>;
+		vin-supply = <&vcc5v0_sys>;
+	};
+
+	vcc3v3_wwan_pwr: regulator-vcc3v3-wwan {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&wwan_power_en>;
+		regulator-name = "vcc3v3_wwan_pwr";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc3v3_4g>;
+	};
+};
+
+&gpio0 {
+	wwan-disable2-n-hog {
+		gpios = <RK_PB2 GPIO_ACTIVE_LOW>;
+		output-low;
+		line-name = "M.2 B-key W_DISABLE2#";
+		gpio-hog;
+	};
+};
+
+&gpio2 {
+	wwan-reset-n-hog {
+		gpios = <RK_PB3 GPIO_ACTIVE_LOW>;
+		output-low;
+		line-name = "M.2 B-key RESET#";
+		gpio-hog;
+	};
+
+	wwan-wake-n-hog {
+		gpios = <RK_PB2 GPIO_ACTIVE_LOW>;
+		input;
+		line-name = "M.2 B-key WoWWAN#";
+		gpio-hog;
+	};
+};
+
+&pcie30phy {
+	data-lanes = <1 1 2 2>;
+};
+
+&pcie3x2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie3x2_rst>;
+	reset-gpios = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
+	vpcie3v3-supply = <&vcc3v3_pcie30>;
+	status = "okay";
+};
+
+&pcie3x4 {
+	num-lanes = <2>;
+};
+
+&pinctrl {
+	wwan {
+		wwan_power_en: wwan-pwr-en {
+			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	pcie3 {
+		pcie3x2_rst: pcie3x2-rst {
+			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	usb {
+		vcc5v0_host_en: vcc5v0-host-en {
+			rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+};
+
+&vcc5v0_host {
+	enable-active-high;
+	gpio = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&vcc5v0_host_en>;
+};

-- 
2.47.2

[PATCH v2 5/5] arm64: dts: rockchip: add USB-C support for ROCK 5B+

[Sebastian Reichel]

Add hardware description for the USB-C port in the Radxa ROCK 5 Model B+
This describes the OHCI, EHCI and XHCI USB parts, but not yet the DisplayPort
AltMode, since the bindings for that are not yet upstream.

Support for the ROCK 5B is prepared, but not exposed at the moment,
since it results in unreliable boot behavior due to hard resets killing
the supply voltage. Some further investigation and fixes in the kernel's
Type-C Port Manager (TCPM) state machine is needed before exposing the
port. The ROCK 5B+ has a dedicated port for powering the board and thus
is not affected.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 .../boot/dts/rockchip/rk3588-rock-5b-plus.dts      |  16 +++
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts    |  23 ++++
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi   | 137 +++++++++++++++++++++
 3 files changed, 176 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts
index 74c7b6502e4dda4b774f43c704ebaee350703c0d..4096cd853f9a909e4233d2c61a1fe5ee83904c4c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts
@@ -99,12 +99,28 @@ pcie3x2_rst: pcie3x2-rst {
 	};
 
 	usb {
+		usbc_sbu_dc: usbc-sbu-dc {
+			rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,
+					<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
 		vcc5v0_host_en: vcc5v0-host-en {
 			rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
 
+&usbc0 {
+	status = "okay";
+};
+
+&usbdp_phy0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&usbc_sbu_dc>;
+	sbu1-dc-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
+	sbu2-dc-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
+};
+
 &vcc5v0_host {
 	enable-active-high;
 	gpio = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index 9407a7c9910ada1f6c803d2e15785a9cbd9bd655..ab0c572ea9234f373af4a47db93fc1786f0e6fbf 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -36,8 +36,20 @@ &uart6 {
 	status = "okay";
 };
 
+&usbdp_phy0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&usbc_sbu_dc>;
+	sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
+	sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
+};
+
 &pinctrl {
 	usb {
+		usbc_sbu_dc: usbc-sbu-dc {
+			rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,
+					<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
 		vcc5v0_host_en: vcc5v0-host-en {
 			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
@@ -50,3 +62,14 @@ &vcc5v0_host {
 	pinctrl-names = "default";
 	pinctrl-0 = <&vcc5v0_host_en>;
 };
+
+/*
+ * Do not yet offer USB-C support on the Rock 5B. The current U-Boot
+ * Linux setup is quite unstable and for many power-supplies needs multiple
+ * hard resets to boot to userspace. Let's enable this once the issues
+ * in the TCPM kernel code have been solved. Without this any automated
+ * boot tests will run into problems.
+ */
+/delete-node/ &usbc0;
+/delete-node/ &usb_host0_xhci;
+/delete-node/ &usbdp_phy0;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
index 6052787d2560978d2bae6cfbeea5fc1d419d583a..314fdc0c1c20b25b0fdc5254f3b090586c169a00 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
@@ -5,6 +5,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/soc/rockchip,vop2.h>
+#include <dt-bindings/usb/pd.h>
 #include "rk3588.dtsi"
 
 / {
@@ -92,6 +93,15 @@ rfkill-bt {
 		shutdown-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
 	};
 
+	vcc12v_dcin: regulator-vcc12v-dcin {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc12v_dcin";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+	};
+
 	vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 {
 		compatible = "regulator-fixed";
 		enable-active-high;
@@ -146,6 +156,19 @@ vcc5v0_sys: regulator-vcc5v0-sys {
 		regulator-boot-on;
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc12v_dcin>;
+	};
+
+	vbus5v0_typec: vbus5v0-typec {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vbus5v0_typec_en>;
+		regulator-name = "vbus5v0_typec";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc5v0_sys>;
 	};
 
 	vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
@@ -309,6 +332,67 @@ regulator-state-mem {
 	};
 };
 
+&i2c4 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c4m1_xfer>;
+	status = "okay";
+
+	usbc0: usb-typec@22 {
+		compatible = "fcs,fusb302";
+		reg = <0x22>;
+		interrupt-parent = <&gpio3>;
+		interrupts = <RK_PB4 IRQ_TYPE_LEVEL_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&usbc0_int>;
+		vbus-supply = <&vbus5v0_typec>;
+		/*
+		 * When the board is starting to send power-delivery messages
+		 * too late (5 seconds according to the specification), the
+		 * power-supply reacts with a hard-reset. That removes the
+		 * power from VBUS for some time, which resets te whole board.
+		 */
+		status = "fail";
+
+		usb_con: connector {
+			compatible = "usb-c-connector";
+			label = "USB-C";
+			data-role = "dual";
+			power-role = "sink";
+			try-power-role = "sink";
+			op-sink-microwatt = <1000000>;
+			sink-pdos =
+				<PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>,
+				<PDO_VAR(5000, 20000, 5000)>;
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				port@0 {
+					reg = <0>;
+					usbc0_role_sw: endpoint {
+						remote-endpoint = <&dwc3_0_role_switch>;
+					};
+				};
+
+				port@1 {
+					reg = <1>;
+					usbc0_orien_sw: endpoint {
+						remote-endpoint = <&usbdp_phy0_orientation_switch>;
+					};
+				};
+
+				port@2 {
+					reg = <2>;
+					dp_altmode_mux: endpoint {
+						remote-endpoint = <&usbdp_phy0_dp_altmode_mux>;
+					};
+				};
+			};
+		};
+	};
+};
+
 &i2c6 {
 	status = "okay";
 
@@ -481,6 +565,16 @@ pcie3_vcc3v3_en: pcie3-vcc3v3-en {
 			rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
+
+	usb {
+		usbc0_int: usbc0-int {
+			rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		vbus5v0_typec_en: vbus5v0-typec-en {
+			rockchip,pins = <2 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
 };
 
 &pwm1 {
@@ -866,6 +960,14 @@ &uart2 {
 	status = "okay";
 };
 
+&u2phy0 {
+	status = "okay";
+};
+
+&u2phy0_otg {
+	status = "okay";
+};
+
 &u2phy1 {
 	status = "okay";
 };
@@ -893,6 +995,27 @@ &u2phy3_host {
 	status = "okay";
 };
 
+&usbdp_phy0 {
+	mode-switch;
+	orientation-switch;
+	status = "okay";
+
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		usbdp_phy0_orientation_switch: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&usbc0_orien_sw>;
+		};
+
+		usbdp_phy0_dp_altmode_mux: endpoint@1 {
+			reg = <1>;
+			remote-endpoint = <&dp_altmode_mux>;
+		};
+	};
+};
+
 &usbdp_phy1 {
 	status = "okay";
 };
@@ -905,6 +1028,20 @@ &usb_host0_ohci {
 	status = "okay";
 };
 
+&usb_host0_xhci {
+	usb-role-switch;
+	status = "okay";
+
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		dwc3_0_role_switch: endpoint {
+			remote-endpoint = <&usbc0_role_sw>;
+		};
+	};
+};
+
 &usb_host1_ehci {
 	status = "okay";
 };

-- 
2.47.2

Re: [PATCH v2 5/5] arm64: dts: rockchip: add USB-C support for ROCK 5B+

[Diederik de Haas]

[-- Attachment #1: Type: text/plain, Size: 8844 bytes --]

Hi,

On Thu May 8, 2025 at 7:48 PM CEST, Sebastian Reichel wrote:
> Add hardware description for the USB-C port in the Radxa ROCK 5 Model B+
> This describes the OHCI, EHCI and XHCI USB parts, but not yet the DisplayPort
> AltMode, since the bindings for that are not yet upstream.
>
> Support for the ROCK 5B is prepared, but not exposed at the moment,
> since it results in unreliable boot behavior due to hard resets killing
> the supply voltage. Some further investigation and fixes in the kernel's
> Type-C Port Manager (TCPM) state machine is needed before exposing the
> port. The ROCK 5B+ has a dedicated port for powering the board and thus
> is not affected.
>
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> ---
>  .../boot/dts/rockchip/rk3588-rock-5b-plus.dts      |  16 +++
>  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts    |  23 ++++
>  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi   | 137 +++++++++++++++++++++
>  3 files changed, 176 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts
> index 74c7b6502e4dda4b774f43c704ebaee350703c0d..4096cd853f9a909e4233d2c61a1fe5ee83904c4c 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts
> @@ -99,12 +99,28 @@ pcie3x2_rst: pcie3x2-rst {
>  	};
>  
>  	usb {
> +		usbc_sbu_dc: usbc-sbu-dc {
> +			rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,
> +					<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
> +		};
> +
>  		vcc5v0_host_en: vcc5v0-host-en {
>  			rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
>  		};
>  	};
>  };
>  
> +&usbc0 {
> +	status = "okay";
> +};
> +
> +&usbdp_phy0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&usbc_sbu_dc>;
> +	sbu1-dc-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
> +	sbu2-dc-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
> +};
> +
>  &vcc5v0_host {
>  	enable-active-high;
>  	gpio = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> index 9407a7c9910ada1f6c803d2e15785a9cbd9bd655..ab0c572ea9234f373af4a47db93fc1786f0e6fbf 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> @@ -36,8 +36,20 @@ &uart6 {
>  	status = "okay";
>  };
>  
> +&usbdp_phy0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&usbc_sbu_dc>;
> +	sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
> +	sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
> +};
> +
>  &pinctrl {
>  	usb {
> +		usbc_sbu_dc: usbc-sbu-dc {
> +			rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,
> +					<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;

Shouldn't these be <4 RK_PA6 ...> and <4 RK_PA7 ...> ?

In the rock5bp_v1.2 schematic they're (IIUC) GPIO0_C4 and _C5, but in
rock_5b_v1450 schematic TYPEC0_SBU1_DC and TYPEC0_SBU2_DC are on
GPIO4_A6 and GPIO4_A7.

And in rock_5b_v1450 GPIO0_C4 and _C5 are connected to WIFI_REG_ON_H and
BT_W AKE_HOST_H respectively.

Cheers,
  Diederik

> +		};
> +
>  		vcc5v0_host_en: vcc5v0-host-en {
>  			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
>  		};
> @@ -50,3 +62,14 @@ &vcc5v0_host {
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&vcc5v0_host_en>;
>  };
> +
> +/*
> + * Do not yet offer USB-C support on the Rock 5B. The current U-Boot
> + * Linux setup is quite unstable and for many power-supplies needs multiple
> + * hard resets to boot to userspace. Let's enable this once the issues
> + * in the TCPM kernel code have been solved. Without this any automated
> + * boot tests will run into problems.
> + */
> +/delete-node/ &usbc0;
> +/delete-node/ &usb_host0_xhci;
> +/delete-node/ &usbdp_phy0;
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
> index 6052787d2560978d2bae6cfbeea5fc1d419d583a..314fdc0c1c20b25b0fdc5254f3b090586c169a00 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
> @@ -5,6 +5,7 @@
>  #include <dt-bindings/gpio/gpio.h>
>  #include <dt-bindings/leds/common.h>
>  #include <dt-bindings/soc/rockchip,vop2.h>
> +#include <dt-bindings/usb/pd.h>
>  #include "rk3588.dtsi"
>  
>  / {
> @@ -92,6 +93,15 @@ rfkill-bt {
>  		shutdown-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
>  	};
>  
> +	vcc12v_dcin: regulator-vcc12v-dcin {
> +		compatible = "regulator-fixed";
> +		regulator-name = "vcc12v_dcin";
> +		regulator-always-on;
> +		regulator-boot-on;
> +		regulator-min-microvolt = <12000000>;
> +		regulator-max-microvolt = <12000000>;
> +	};
> +
>  	vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 {
>  		compatible = "regulator-fixed";
>  		enable-active-high;
> @@ -146,6 +156,19 @@ vcc5v0_sys: regulator-vcc5v0-sys {
>  		regulator-boot-on;
>  		regulator-min-microvolt = <5000000>;
>  		regulator-max-microvolt = <5000000>;
> +		vin-supply = <&vcc12v_dcin>;
> +	};
> +
> +	vbus5v0_typec: vbus5v0-typec {
> +		compatible = "regulator-fixed";
> +		enable-active-high;
> +		gpio = <&gpio2 RK_PB6 GPIO_ACTIVE_HIGH>;
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&vbus5v0_typec_en>;
> +		regulator-name = "vbus5v0_typec";
> +		regulator-min-microvolt = <5000000>;
> +		regulator-max-microvolt = <5000000>;
> +		vin-supply = <&vcc5v0_sys>;
>  	};
>  
>  	vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
> @@ -309,6 +332,67 @@ regulator-state-mem {
>  	};
>  };
>  
> +&i2c4 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&i2c4m1_xfer>;
> +	status = "okay";
> +
> +	usbc0: usb-typec@22 {
> +		compatible = "fcs,fusb302";
> +		reg = <0x22>;
> +		interrupt-parent = <&gpio3>;
> +		interrupts = <RK_PB4 IRQ_TYPE_LEVEL_LOW>;
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&usbc0_int>;
> +		vbus-supply = <&vbus5v0_typec>;
> +		/*
> +		 * When the board is starting to send power-delivery messages
> +		 * too late (5 seconds according to the specification), the
> +		 * power-supply reacts with a hard-reset. That removes the
> +		 * power from VBUS for some time, which resets te whole board.
> +		 */
> +		status = "fail";
> +
> +		usb_con: connector {
> +			compatible = "usb-c-connector";
> +			label = "USB-C";
> +			data-role = "dual";
> +			power-role = "sink";
> +			try-power-role = "sink";
> +			op-sink-microwatt = <1000000>;
> +			sink-pdos =
> +				<PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>,
> +				<PDO_VAR(5000, 20000, 5000)>;
> +
> +			ports {
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +
> +				port@0 {
> +					reg = <0>;
> +					usbc0_role_sw: endpoint {
> +						remote-endpoint = <&dwc3_0_role_switch>;
> +					};
> +				};
> +
> +				port@1 {
> +					reg = <1>;
> +					usbc0_orien_sw: endpoint {
> +						remote-endpoint = <&usbdp_phy0_orientation_switch>;
> +					};
> +				};
> +
> +				port@2 {
> +					reg = <2>;
> +					dp_altmode_mux: endpoint {
> +						remote-endpoint = <&usbdp_phy0_dp_altmode_mux>;
> +					};
> +				};
> +			};
> +		};
> +	};
> +};
> +
>  &i2c6 {
>  	status = "okay";
>  
> @@ -481,6 +565,16 @@ pcie3_vcc3v3_en: pcie3-vcc3v3-en {
>  			rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
>  		};
>  	};
> +
> +	usb {
> +		usbc0_int: usbc0-int {
> +			rockchip,pins = <3 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
> +		};
> +
> +		vbus5v0_typec_en: vbus5v0-typec-en {
> +			rockchip,pins = <2 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
> +		};
> +	};
>  };
>  
>  &pwm1 {
> @@ -866,6 +960,14 @@ &uart2 {
>  	status = "okay";
>  };
>  
> +&u2phy0 {
> +	status = "okay";
> +};
> +
> +&u2phy0_otg {
> +	status = "okay";
> +};
> +
>  &u2phy1 {
>  	status = "okay";
>  };
> @@ -893,6 +995,27 @@ &u2phy3_host {
>  	status = "okay";
>  };
>  
> +&usbdp_phy0 {
> +	mode-switch;
> +	orientation-switch;
> +	status = "okay";
> +
> +	port {
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +
> +		usbdp_phy0_orientation_switch: endpoint@0 {
> +			reg = <0>;
> +			remote-endpoint = <&usbc0_orien_sw>;
> +		};
> +
> +		usbdp_phy0_dp_altmode_mux: endpoint@1 {
> +			reg = <1>;
> +			remote-endpoint = <&dp_altmode_mux>;
> +		};
> +	};
> +};
> +
>  &usbdp_phy1 {
>  	status = "okay";
>  };
> @@ -905,6 +1028,20 @@ &usb_host0_ohci {
>  	status = "okay";
>  };
>  
> +&usb_host0_xhci {
> +	usb-role-switch;
> +	status = "okay";
> +
> +	port {
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +
> +		dwc3_0_role_switch: endpoint {
> +			remote-endpoint = <&usbc0_role_sw>;
> +		};
> +	};
> +};
> +
>  &usb_host1_ehci {
>  	status = "okay";
>  };


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v2 5/5] arm64: dts: rockchip: add USB-C support for ROCK 5B+

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 3693 bytes --]

Hi,

On Fri, May 09, 2025 at 03:18:04PM +0200, Diederik de Haas wrote:
> On Thu May 8, 2025 at 7:48 PM CEST, Sebastian Reichel wrote:
> > Add hardware description for the USB-C port in the Radxa ROCK 5 Model B+
> > This describes the OHCI, EHCI and XHCI USB parts, but not yet the DisplayPort
> > AltMode, since the bindings for that are not yet upstream.
> >
> > Support for the ROCK 5B is prepared, but not exposed at the moment,
> > since it results in unreliable boot behavior due to hard resets killing
> > the supply voltage. Some further investigation and fixes in the kernel's
> > Type-C Port Manager (TCPM) state machine is needed before exposing the
> > port. The ROCK 5B+ has a dedicated port for powering the board and thus
> > is not affected.
> >
> > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> > ---
> >  .../boot/dts/rockchip/rk3588-rock-5b-plus.dts      |  16 +++
> >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts    |  23 ++++
> >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi   | 137 +++++++++++++++++++++
> >  3 files changed, 176 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts
> > index 74c7b6502e4dda4b774f43c704ebaee350703c0d..4096cd853f9a909e4233d2c61a1fe5ee83904c4c 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts
> > +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts
> > @@ -99,12 +99,28 @@ pcie3x2_rst: pcie3x2-rst {
> >  	};
> >  
> >  	usb {
> > +		usbc_sbu_dc: usbc-sbu-dc {
> > +			rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,
> > +					<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
> > +		};
> > +
> >  		vcc5v0_host_en: vcc5v0-host-en {
> >  			rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
> >  		};
> >  	};
> >  };
> >  
> > +&usbc0 {
> > +	status = "okay";
> > +};
> > +
> > +&usbdp_phy0 {
> > +	pinctrl-names = "default";
> > +	pinctrl-0 = <&usbc_sbu_dc>;
> > +	sbu1-dc-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
> > +	sbu2-dc-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
> > +};
> > +
> >  &vcc5v0_host {
> >  	enable-active-high;
> >  	gpio = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> > index 9407a7c9910ada1f6c803d2e15785a9cbd9bd655..ab0c572ea9234f373af4a47db93fc1786f0e6fbf 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> > +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> > @@ -36,8 +36,20 @@ &uart6 {
> >  	status = "okay";
> >  };
> >  
> > +&usbdp_phy0 {
> > +	pinctrl-names = "default";
> > +	pinctrl-0 = <&usbc_sbu_dc>;
> > +	sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
> > +	sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
> > +};
> > +
> >  &pinctrl {
> >  	usb {
> > +		usbc_sbu_dc: usbc-sbu-dc {
> > +			rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,
> > +					<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
> 
> Shouldn't these be <4 RK_PA6 ...> and <4 RK_PA7 ...> ?
> 
> In the rock5bp_v1.2 schematic they're (IIUC) GPIO0_C4 and _C5, but in
> rock_5b_v1450 schematic TYPEC0_SBU1_DC and TYPEC0_SBU2_DC are on
> GPIO4_A6 and GPIO4_A7.
> 
> And in rock_5b_v1450 GPIO0_C4 and _C5 are connected to WIFI_REG_ON_H and
> BT_W AKE_HOST_H respectively.

Yes. I screwed that up when copying over the new pinctrl from the
5B+. FWIW I'm not very happy about the /delete-node/ hack anyways.
Let's postpone (drop) this patch adding USB-C support for now. Hopefully
I soon find a way to get the PD sink more stable.

Greetings,

-- Sebastian

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v2 0/5] arm64: dts: rockchip: add ROCK 5B+ support

[Rob Herring (Arm)]

On Thu, 08 May 2025 19:48:49 +0200, Sebastian Reichel wrote:
> This series adds support for the ROCK 5B+, which (as the name suggests)
> is an improved version of the ROCK 5B. It also adds initial USB-C
> support for both the ROCK 5B and the 5B+.
> 
> Changes in PATCHv2:
>  - Link to v1: https://lore.kernel.org/r/20250324-rock5bp-for-upstream-v1-0-6217edf15b19@kernel.org
>  - Replaced DT binding patch with the version from NAOKI
>  - Dropped unused pinctrl for vcc5v0_host_en from the shared DT
>  - Moved USB-C SBU DC pins to board specific files, since they differ
>    between Rock 5B and Rock 5B+
>  - Added pinmux for SBU DC pins
>  - Rebased to latest version of Heiko's for-next branch
>  - Disable USB-C on Rock 5B for now
> 
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> ---
> FUKAUMI Naoki (1):
>       dt-bindings: arm: rockchip: Add Radxa ROCK 5B+
> 
> Sebastian Reichel (4):
>       arm64: dts: rockchip: move rock 5b to include file
>       arm64: dts: rockchip: move rock 5b to include file
>       arm64: dts: rockchip: add Rock 5B+
>       arm64: dts: rockchip: add USB-C support for ROCK 5B+
> 
>  .../devicetree/bindings/arm/rockchip.yaml          |    5 +
>  arch/arm64/boot/dts/rockchip/Makefile              |    1 +
>  .../boot/dts/rockchip/rk3588-rock-5b-plus.dts      |  129 +++
>  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts    |  970 +-----------------
>  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi   | 1082 ++++++++++++++++++++
>  5 files changed, 1247 insertions(+), 940 deletions(-)
> ---
> base-commit: b7caeb9545db25649eda36ce593b70cc2aa804ab
> change-id: 20250324-rock5bp-for-upstream-fd85b00b593b
> 
> Best regards,
> --
> Sebastian Reichel <sre@kernel.org>
> 
> 
> 


My bot found new DTB warnings on the .dts files added or changed in this
series.

Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings
are fixed by another series. Ultimately, it is up to the platform
maintainer whether these warnings are acceptable or not. No need to reply
unless the platform maintainer has comments.

If you already ran DT checks and didn't see these error(s), then
make sure dt-schema is up to date:

  pip3 install dtschema --upgrade


This patch series was applied (using b4) to base:
 Base: base-commit b7caeb9545db25649eda36ce593b70cc2aa804ab not known, ignoring
 Base: attempting to guess base-commit...
 Base: tags/v6.15-rc1-40-g425af91c5802 (best guess, 2/3 blobs matched)

If this is not the correct base, please add 'base-commit' tag
(or use b4 which does this automatically)

New warnings running 'make CHECK_DTBS=y for arch/arm64/boot/dts/rockchip/' for 20250508-rock5bp-for-upstream-v2-0-677033cc1ac2@kernel.org:

arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dtb: /edp@fdec0000: failed to match any schema with compatible: ['rockchip,rk3588-edp']
arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dtb: /edp@fded0000: failed to match any schema with compatible: ['rockchip,rk3588-edp']

Re: [PATCH v2 0/5] arm64: dts: rockchip: add ROCK 5B+ support

[Heiko Stübner]

Am Freitag, 9. Mai 2025, 16:17:02 Mitteleuropäische Sommerzeit schrieb Rob Herring (Arm):
> 
> On Thu, 08 May 2025 19:48:49 +0200, Sebastian Reichel wrote:
> > This series adds support for the ROCK 5B+, which (as the name suggests)
> > is an improved version of the ROCK 5B. It also adds initial USB-C
> > support for both the ROCK 5B and the 5B+.
> > 
> > Changes in PATCHv2:
> >  - Link to v1: https://lore.kernel.org/r/20250324-rock5bp-for-upstream-v1-0-6217edf15b19@kernel.org
> >  - Replaced DT binding patch with the version from NAOKI
> >  - Dropped unused pinctrl for vcc5v0_host_en from the shared DT
> >  - Moved USB-C SBU DC pins to board specific files, since they differ
> >    between Rock 5B and Rock 5B+
> >  - Added pinmux for SBU DC pins
> >  - Rebased to latest version of Heiko's for-next branch
> >  - Disable USB-C on Rock 5B for now
> > 
> > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> > ---
> > FUKAUMI Naoki (1):
> >       dt-bindings: arm: rockchip: Add Radxa ROCK 5B+
> > 
> > Sebastian Reichel (4):
> >       arm64: dts: rockchip: move rock 5b to include file
> >       arm64: dts: rockchip: move rock 5b to include file
> >       arm64: dts: rockchip: add Rock 5B+
> >       arm64: dts: rockchip: add USB-C support for ROCK 5B+
> > 
> >  .../devicetree/bindings/arm/rockchip.yaml          |    5 +
> >  arch/arm64/boot/dts/rockchip/Makefile              |    1 +
> >  .../boot/dts/rockchip/rk3588-rock-5b-plus.dts      |  129 +++
> >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts    |  970 +-----------------
> >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi   | 1082 ++++++++++++++++++++
> >  5 files changed, 1247 insertions(+), 940 deletions(-)
> > ---
> > base-commit: b7caeb9545db25649eda36ce593b70cc2aa804ab
> > change-id: 20250324-rock5bp-for-upstream-fd85b00b593b
> > 
> > Best regards,
> > --
> > Sebastian Reichel <sre@kernel.org>
> > 
> > 
> > 
> 
> 
> My bot found new DTB warnings on the .dts files added or changed in this
> series.
> 
> Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings
> are fixed by another series. Ultimately, it is up to the platform
> maintainer whether these warnings are acceptable or not. No need to reply
> unless the platform maintainer has comments.
> 
> If you already ran DT checks and didn't see these error(s), then
> make sure dt-schema is up to date:
> 
>   pip3 install dtschema --upgrade
> 
> 
> This patch series was applied (using b4) to base:
>  Base: base-commit b7caeb9545db25649eda36ce593b70cc2aa804ab not known, ignoring
>  Base: attempting to guess base-commit...
>  Base: tags/v6.15-rc1-40-g425af91c5802 (best guess, 2/3 blobs matched)
> 
> If this is not the correct base, please add 'base-commit' tag
> (or use b4 which does this automatically)
> 
> New warnings running 'make CHECK_DTBS=y for arch/arm64/boot/dts/rockchip/' for 20250508-rock5bp-for-upstream-v2-0-677033cc1ac2@kernel.org:
> 
> arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dtb: /edp@fdec0000: failed to match any schema with compatible: ['rockchip,rk3588-edp']
> arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dtb: /edp@fded0000: failed to match any schema with compatible: ['rockchip,rk3588-edp']

This should be already fixed by the rk3588-edp addition in linux-next:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=f855146263b14abadd8d5bd0e280e54fbab3bd18

Re: [PATCH v2 0/5] arm64: dts: rockchip: add ROCK 5B+ support

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 4261 bytes --]

Hi,

On Fri, May 09, 2025 at 05:12:22PM +0200, Heiko Stübner wrote:
> Am Freitag, 9. Mai 2025, 16:17:02 Mitteleuropäische Sommerzeit schrieb Rob Herring (Arm):
> > 
> > On Thu, 08 May 2025 19:48:49 +0200, Sebastian Reichel wrote:
> > > This series adds support for the ROCK 5B+, which (as the name suggests)
> > > is an improved version of the ROCK 5B. It also adds initial USB-C
> > > support for both the ROCK 5B and the 5B+.
> > > 
> > > Changes in PATCHv2:
> > >  - Link to v1: https://lore.kernel.org/r/20250324-rock5bp-for-upstream-v1-0-6217edf15b19@kernel.org
> > >  - Replaced DT binding patch with the version from NAOKI
> > >  - Dropped unused pinctrl for vcc5v0_host_en from the shared DT
> > >  - Moved USB-C SBU DC pins to board specific files, since they differ
> > >    between Rock 5B and Rock 5B+
> > >  - Added pinmux for SBU DC pins
> > >  - Rebased to latest version of Heiko's for-next branch
> > >  - Disable USB-C on Rock 5B for now
> > > 
> > > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> > > ---
> > > FUKAUMI Naoki (1):
> > >       dt-bindings: arm: rockchip: Add Radxa ROCK 5B+
> > > 
> > > Sebastian Reichel (4):
> > >       arm64: dts: rockchip: move rock 5b to include file
> > >       arm64: dts: rockchip: move rock 5b to include file
> > >       arm64: dts: rockchip: add Rock 5B+
> > >       arm64: dts: rockchip: add USB-C support for ROCK 5B+
> > > 
> > >  .../devicetree/bindings/arm/rockchip.yaml          |    5 +
> > >  arch/arm64/boot/dts/rockchip/Makefile              |    1 +
> > >  .../boot/dts/rockchip/rk3588-rock-5b-plus.dts      |  129 +++
> > >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts    |  970 +-----------------
> > >  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi   | 1082 ++++++++++++++++++++
> > >  5 files changed, 1247 insertions(+), 940 deletions(-)
> > > ---
> > > base-commit: b7caeb9545db25649eda36ce593b70cc2aa804ab
> > > change-id: 20250324-rock5bp-for-upstream-fd85b00b593b
> > > 
> > > Best regards,
> > > --
> > > Sebastian Reichel <sre@kernel.org>
> > > 
> > > 
> > > 
> > 
> > 
> > My bot found new DTB warnings on the .dts files added or changed in this
> > series.
> > 
> > Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings
> > are fixed by another series. Ultimately, it is up to the platform
> > maintainer whether these warnings are acceptable or not. No need to reply
> > unless the platform maintainer has comments.
> > 
> > If you already ran DT checks and didn't see these error(s), then
> > make sure dt-schema is up to date:
> > 
> >   pip3 install dtschema --upgrade
> > 
> > 
> > This patch series was applied (using b4) to base:
> >  Base: base-commit b7caeb9545db25649eda36ce593b70cc2aa804ab not known, ignoring
> >  Base: attempting to guess base-commit...
> >  Base: tags/v6.15-rc1-40-g425af91c5802 (best guess, 2/3 blobs matched)
> >
> > If this is not the correct base, please add 'base-commit' tag
> > (or use b4 which does this automatically)

Looks like I missed that the rebase to your latest for-next
branch kept one patch, which you dropped ("Revert "dt-bindings: mfd:
syscon: Add rk3528 QoS register compatible") resulting in the
unknown base commit being specified by b4. FWIW the real base commit
would have been e8adbfc19627.

> > New warnings running 'make CHECK_DTBS=y for arch/arm64/boot/dts/rockchip/' for 20250508-rock5bp-for-upstream-v2-0-677033cc1ac2@kernel.org:
> > 
> > arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dtb: /edp@fdec0000: failed to match any schema with compatible: ['rockchip,rk3588-edp']
> > arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dtb: /edp@fded0000: failed to match any schema with compatible: ['rockchip,rk3588-edp']
> 
> This should be already fixed by the rk3588-edp addition in linux-next:
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=f855146263b14abadd8d5bd0e280e54fbab3bd18

In any case it's unrelated to this series, since neither the ROCK
5B, nor the 5B+ use or reference the edp node at all.

Makes me wonder, if it would also have triggered with the correct
base (since the eDP DT binding is not in that branch).

-- Sebastian

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: (subset) [PATCH v2 0/5] arm64: dts: rockchip: add ROCK 5B+ support

[Heiko Stuebner]

On Thu, 08 May 2025 19:48:49 +0200, Sebastian Reichel wrote:
> This series adds support for the ROCK 5B+, which (as the name suggests)
> is an improved version of the ROCK 5B. It also adds initial USB-C
> support for both the ROCK 5B and the 5B+.
> 
> Changes in PATCHv2:
>  - Link to v1: https://lore.kernel.org/r/20250324-rock5bp-for-upstream-v1-0-6217edf15b19@kernel.org
>  - Replaced DT binding patch with the version from NAOKI
>  - Dropped unused pinctrl for vcc5v0_host_en from the shared DT
>  - Moved USB-C SBU DC pins to board specific files, since they differ
>    between Rock 5B and Rock 5B+
>  - Added pinmux for SBU DC pins
>  - Rebased to latest version of Heiko's for-next branch
>  - Disable USB-C on Rock 5B for now
> 
> [...]

Applied, thanks!

[1/5] arm64: dts: rockchip: move rock 5b to include file
      commit: aadfbdcf7e1e7f3892e0e4bdcc3c9c7c9adfb723
[2/5] arm64: dts: rockchip: move rock 5b to include file
      commit: aadfbdcf7e1e7f3892e0e4bdcc3c9c7c9adfb723

The two above squashed together as intended and talked about
on IRC.

[3/5] dt-bindings: arm: rockchip: Add Radxa ROCK 5B+
      commit: 874c1117621d441e0ef4a609665f228a4b8a1932
[4/5] arm64: dts: rockchip: add Rock 5B+
      commit: 376cb9696298df2028afb620a9dc6c4b10a18605

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