[PATCH v2 0/4] arm64: dts: rockchip: cosmetic changes for Radxa ROCK 5B

[PATCH v2 0/4] arm64: dts: rockchip: cosmetic changes for Radxa ROCK 5B

[FUKAUMI Naoki]

this patch series sort nodes and properties, remove redundant
properties, and minor cosmetic changes.

no functional change is intended.

this patch series depend on following patch series:
 "arm64: dts: rockchip: sync dts with schematic for Radxa ROCK 5B"
 https://patchwork.kernel.org/project/linux-rockchip/cover/20241130004057.7432-1-naoki@radxa.com/

FUKAUMI Naoki (4):
  arm64: dts: rockchip: sort nodes in .dts for Radxa ROCK 5B
  arm64: dts: rockchip: sort nodes in root node for Radxa ROCK 5B
  arm64: dts: rockchip: sort properties in .dts for Radxa ROCK 5B
  arm64: dts: rockchip: cosmetic changes for Radxa ROCK 5B

 .../boot/dts/rockchip/rk3588-rock-5b.dts      | 184 ++++++++----------
 1 file changed, 86 insertions(+), 98 deletions(-)

-- 
2.43.0

[PATCH v2 1/4] arm64: dts: rockchip: sort nodes in .dts for Radxa ROCK 5B

[FUKAUMI Naoki]

sort alphanumerically.

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
Changes in v2:
- none
---
 .../boot/dts/rockchip/rk3588-rock-5b.dts      | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index fbe231973b24..08f5efeeac9c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -473,21 +473,6 @@ &sdhci {
 	status = "okay";
 };
 
-&sdmmc {
-	max-frequency = <200000000>;
-	no-sdio;
-	no-mmc;
-	bus-width = <4>;
-	cap-mmc-highspeed;
-	cap-sd-highspeed;
-	cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
-	disable-wp;
-	sd-uhs-sdr104;
-	vmmc-supply = <&vcc_3v3_s3>;
-	vqmmc-supply = <&vccio_sd_s0>;
-	status = "okay";
-};
-
 &sdio {
 	max-frequency = <200000000>;
 	no-sd;
@@ -509,6 +494,21 @@ &sdio {
 	status = "okay";
 };
 
+&sdmmc {
+	max-frequency = <200000000>;
+	no-sdio;
+	no-mmc;
+	bus-width = <4>;
+	cap-mmc-highspeed;
+	cap-sd-highspeed;
+	cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
+	disable-wp;
+	sd-uhs-sdr104;
+	vmmc-supply = <&vcc_3v3_s3>;
+	vqmmc-supply = <&vccio_sd_s0>;
+	status = "okay";
+};
+
 &sfc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&fspim2_pins>;
@@ -523,12 +523,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>;
@@ -858,11 +852,6 @@ &tsadc {
 	status = "okay";
 };
 
-&uart2 {
-	pinctrl-0 = <&uart2m0_xfer>;
-	status = "okay";
-};
-
 &u2phy1 {
 	status = "okay";
 };
@@ -891,7 +880,14 @@ &u2phy3_host {
 	status = "okay";
 };
 
-&usbdp_phy1 {
+&uart2 {
+	pinctrl-0 = <&uart2m0_xfer>;
+	status = "okay";
+};
+
+&uart6 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>;
 	status = "okay";
 };
 
@@ -920,7 +916,7 @@ &usb_host2_xhci {
 	status = "okay";
 };
 
-&vop_mmu {
+&usbdp_phy1 {
 	status = "okay";
 };
 
@@ -928,6 +924,10 @@ &vop {
 	status = "okay";
 };
 
+&vop_mmu {
+	status = "okay";
+};
+
 &vp0 {
 	vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
 		reg = <ROCKCHIP_VOP2_EP_HDMI0>;
-- 
2.43.0

[PATCH v2 2/4] arm64: dts: rockchip: sort nodes in root node for Radxa ROCK 5B

[FUKAUMI Naoki]

sort alphanumerically.

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
Changes in v2:
- none
---
 .../boot/dts/rockchip/rk3588-rock-5b.dts      | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index 08f5efeeac9c..c816febb486a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -91,30 +91,30 @@ typec_vin: regulator-typec-vin {
 		regulator-boot-on;
 	};
 
-	vcc3v3_wf: regulator-vcc3v3-wf {
+	/* pi6c pcie clock generator */
+	vcc3v3_pi6c_05: vcc3v3_pcie30: regulator-vcc3v3-pi6c-05 {
 		compatible = "regulator-fixed";
 		enable-active-high;
-		gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
+		gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
 		pinctrl-names = "default";
-		pinctrl-0 = <&ekey_en>;
-		regulator-name = "vcc3v3_wf";
+		pinctrl-0 = <&pcie30x4_pwren_h>;
+		regulator-name = "vcc3v3_pi6c_05";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
-		startup-delay-us = <50000>;
+		startup-delay-us = <5000>;
 		vin-supply = <&vcc5v0_sys>;
 	};
 
-	/* pi6c pcie clock generator */
-	vcc3v3_pi6c_05: vcc3v3_pcie30: regulator-vcc3v3-pi6c-05 {
+	vcc3v3_wf: regulator-vcc3v3-wf {
 		compatible = "regulator-fixed";
 		enable-active-high;
-		gpios = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
+		gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
 		pinctrl-names = "default";
-		pinctrl-0 = <&pcie30x4_pwren_h>;
-		regulator-name = "vcc3v3_pi6c_05";
+		pinctrl-0 = <&ekey_en>;
+		regulator-name = "vcc3v3_wf";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
-		startup-delay-us = <5000>;
+		startup-delay-us = <50000>;
 		vin-supply = <&vcc5v0_sys>;
 	};
 
@@ -128,6 +128,16 @@ vcc4v0_sys: regulator-vcc4v0-sys {
 		vin-supply = <&vcc5v0_sys>;
 	};
 
+	vcc5v0_sys: regulator-vcc5v0-sys {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&typec_vin>;
+	};
+
 	vcc5v_usb: regulator-vcc5v-usb {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc5v_usb";
@@ -140,16 +150,6 @@ vcc5v_usb: regulator-vcc5v-usb {
 		vin-supply = <&vcc5v0_sys>;
 	};
 
-	vcc5v0_sys: regulator-vcc5v0-sys {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc5v0_sys";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		vin-supply = <&typec_vin>;
-	};
-
 	vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc_1v1_nldo_s3";
-- 
2.43.0

[PATCH v2 3/4] arm64: dts: rockchip: sort properties in .dts for Radxa ROCK 5B

[FUKAUMI Naoki]

sort alphanumerically.

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
Changes in v2
- fix order in pcie2 in pinctrl
---
 .../boot/dts/rockchip/rk3588-rock-5b.dts      | 85 +++++++++----------
 1 file changed, 39 insertions(+), 46 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index c816febb486a..c29c61b4ffa7 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -24,18 +24,15 @@ chosen {
 	analog-sound {
 		compatible = "audio-graph-card";
 		label = "rk3588-es8316";
-
-		widgets = "Microphone", "Mic Jack",
-			  "Headphone", "Headphones";
-
-		routing = "MIC2", "Mic Jack",
-			  "Headphones", "HPOL",
-			  "Headphones", "HPOR";
-
 		dais = <&i2s0_8ch_p0>;
 		hp-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&hp_detect>;
+		routing = "MIC2", "Mic Jack",
+			  "Headphones", "HPOL",
+			  "Headphones", "HPOR";
+		widgets = "Microphone", "Mic Jack",
+			  "Headphone", "Headphones";
 	};
 
 	hdmi0-con {
@@ -140,13 +137,13 @@ vcc5v0_sys: regulator-vcc5v0-sys {
 
 	vcc5v_usb: regulator-vcc5v-usb {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc5v_usb";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
 		enable-active-high;
 		gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&usb_host_pwren_h>;
+		regulator-name = "vcc5v_usb";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
 		vin-supply = <&vcc5v0_sys>;
 	};
 
@@ -315,10 +312,10 @@ &i2c7 {
 	es8316: audio-codec@11 {
 		compatible = "everest,es8316";
 		reg = <0x11>;
-		clocks = <&cru I2S0_8CH_MCLKOUT>;
-		clock-names = "mclk";
 		assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;
 		assigned-clock-rates = <12288000>;
+		clocks = <&cru I2S0_8CH_MCLKOUT>;
+		clock-names = "mclk";
 		#sound-dai-cells = <0>;
 
 		port {
@@ -407,27 +404,15 @@ &pcie3x4 {
 };
 
 &pinctrl {
-	rtc {
-		rtc_int_l: rtc-int-l {
-			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
-
-	sound {
-		hp_detect: hp-detect {
-			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
+	pcie2 {
+		ekey_en: ekey-en {
+			rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
-	};
 
-	pcie2 {
 		pcie30x1_0_perstn_m1_l: pcie30x1-0-perstn-m1-l {
 			rockchip,pins = <4 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
-		ekey_en: ekey-en {
-			rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-
 		pcie_perst_l: pcie-perst-l {
 			rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
@@ -443,6 +428,18 @@ pcie30x4_pwren_h: pcie30x4-pwren-h {
 		};
 	};
 
+	rtc {
+		rtc_int_l: rtc-int-l {
+			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
+	sound {
+		hp_detect: hp-detect {
+			rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
+
 	usb {
 		usb_host_pwren_h: usb-host-pwren-h {
 			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -465,44 +462,44 @@ &saradc {
 
 &sdhci {
 	bus-width = <8>;
+	mmc-hs400-1_8v;
+	mmc-hs400-enhanced-strobe;
 	no-sdio;
 	no-sd;
 	non-removable;
-	mmc-hs400-1_8v;
-	mmc-hs400-enhanced-strobe;
 	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;
+	no-sd;
+	no-mmc;
+	non-removable;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdiom0_pins>;
 	sd-uhs-sdr12;
 	sd-uhs-sdr25;
 	sd-uhs-sdr50;
 	sd-uhs-sdr104;
 	vmmc-supply = <&vcc3v3_wf>;
 	vqmmc-supply = <&vcc_1v8_s3>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&sdiom0_pins>;
+	wakeup-source;
 	status = "okay";
 };
 
 &sdmmc {
 	max-frequency = <200000000>;
-	no-sdio;
-	no-mmc;
 	bus-width = <4>;
 	cap-mmc-highspeed;
 	cap-sd-highspeed;
 	cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
 	disable-wp;
+	no-sdio;
+	no-mmc;
 	sd-uhs-sdr104;
 	vmmc-supply = <&vcc_3v3_s3>;
 	vqmmc-supply = <&vccio_sd_s0>;
@@ -527,22 +524,21 @@ &spi2 {
 	status = "okay";
 	assigned-clocks = <&cru CLK_SPI2>;
 	assigned-clock-rates = <200000000>;
+	num-cs = <1>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>;
-	num-cs = <1>;
 
 	pmic@0 {
 		compatible = "rockchip,rk806";
-		spi-max-frequency = <1000000>;
 		reg = <0x0>;
-
+		gpio-controller;
+		#gpio-cells = <2>;
 		interrupt-parent = <&gpio0>;
 		interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
-
 		pinctrl-names = "default";
 		pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>,
 			    <&rk806_dvs2_null>, <&rk806_dvs3_null>;
-
+		spi-max-frequency = <1000000>;
 		system-power-controller;
 
 		vcc1-supply = <&vcc4v0_sys>;
@@ -561,9 +557,6 @@ pmic@0 {
 		vcc14-supply = <&vcc_1v1_nldo_s3>;
 		vcca-supply = <&vcc4v0_sys>;
 
-		gpio-controller;
-		#gpio-cells = <2>;
-
 		rk806_dvs1_null: dvs1-null-pins {
 			pins = "gpio_pwrctrl1";
 			function = "pin_fun0";
-- 
2.43.0

[PATCH v2 4/4] arm64: dts: rockchip: cosmetic changes for Radxa ROCK 5B

[FUKAUMI Naoki]

no functional change is intended.

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
Changes in v2:
- none
---
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index c29c61b4ffa7..3662549714e6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -138,7 +138,7 @@ vcc5v0_sys: regulator-vcc5v0-sys {
 	vcc5v_usb: regulator-vcc5v-usb {
 		compatible = "regulator-fixed";
 		enable-active-high;
-		gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
+		gpios = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&usb_host_pwren_h>;
 		regulator-name = "vcc5v_usb";
@@ -293,7 +293,7 @@ regulator-state-mem {
 &i2c6 {
 	status = "okay";
 
-	hym8563: rtc@51 {
+	rtc@51 {
 		compatible = "haoyu,hym8563";
 		reg = <0x51>;
 		#clock-cells = <0>;
@@ -309,7 +309,7 @@ hym8563: rtc@51 {
 &i2c7 {
 	status = "okay";
 
-	es8316: audio-codec@11 {
+	audio-codec@11 {
 		compatible = "everest,es8316";
 		reg = <0x11>;
 		assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;
@@ -471,7 +471,6 @@ &sdhci {
 };
 
 &sdio {
-	max-frequency = <200000000>;
 	bus-width = <4>;
 	cap-sdio-irq;
 	disable-wp;
@@ -481,9 +480,6 @@ &sdio {
 	non-removable;
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdiom0_pins>;
-	sd-uhs-sdr12;
-	sd-uhs-sdr25;
-	sd-uhs-sdr50;
 	sd-uhs-sdr104;
 	vmmc-supply = <&vcc3v3_wf>;
 	vqmmc-supply = <&vcc_1v8_s3>;
@@ -492,7 +488,6 @@ &sdio {
 };
 
 &sdmmc {
-	max-frequency = <200000000>;
 	bus-width = <4>;
 	cap-mmc-highspeed;
 	cap-sd-highspeed;
@@ -530,7 +525,7 @@ &spi2 {
 
 	pmic@0 {
 		compatible = "rockchip,rk806";
-		reg = <0x0>;
+		reg = <0>;
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-parent = <&gpio0>;
-- 
2.43.0

Re: [PATCH v2 0/4] arm64: dts: rockchip: cosmetic changes for Radxa ROCK 5B

[Dragan Simic]

Hello Fukaumi,

On 2024-12-02 03:32, FUKAUMI Naoki wrote:
> this patch series sort nodes and properties, remove redundant
> properties, and minor cosmetic changes.
> 
> no functional change is intended.
> 
> this patch series depend on following patch series:
>  "arm64: dts: rockchip: sync dts with schematic for Radxa ROCK 5B"
> 
> https://patchwork.kernel.org/project/linux-rockchip/cover/20241130004057.7432-1-naoki@radxa.com/
> 
> FUKAUMI Naoki (4):
>   arm64: dts: rockchip: sort nodes in .dts for Radxa ROCK 5B
>   arm64: dts: rockchip: sort nodes in root node for Radxa ROCK 5B
>   arm64: dts: rockchip: sort properties in .dts for Radxa ROCK 5B
>   arm64: dts: rockchip: cosmetic changes for Radxa ROCK 5B
> 
>  .../boot/dts/rockchip/rk3588-rock-5b.dts      | 184 ++++++++----------
>  1 file changed, 86 insertions(+), 98 deletions(-)

I'd suggest that you expand the descriptions of all four patches
in this series.  The way they're currently written leaves a lot of
room for improvement, such as turning them into proper sentences
and expanding the wording to describe the intent and nature of the
introduced changes better.

The cover letter surely provides an additional explanation for
the entire series, but please note that only the patch descriptions
can find their way into the repository, so each patch description
needs to be self-contained and independent of the cover letter and
the descriptions of other patches in the series.

Re: [PATCH v2 0/4] arm64: dts: rockchip: cosmetic changes for Radxa ROCK 5B

[FUKAUMI Naoki]

Hi,

I'm preparing patches for ROCK 5B+ (upgrade version of 5B) and for ROCK 
5T (upgrade version of 5B+).

I think it's possible to make shared .dtsi for these three boards.

then, these two patch series
  "arm64: dts: rockchip: sync dts with schematic for Radxa ROCK 5B"
and
  "arm64: dts: rockchip: cosmetic changes for Radxa ROCK 5B"
will be dropped.

please wait a week or so to submit my new patch series.

Best regards,

--
FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.

On 12/2/24 11:32, FUKAUMI Naoki wrote:
> this patch series sort nodes and properties, remove redundant
> properties, and minor cosmetic changes.
> 
> no functional change is intended.
> 
> this patch series depend on following patch series:
>   "arm64: dts: rockchip: sync dts with schematic for Radxa ROCK 5B"
>   https://patchwork.kernel.org/project/linux-rockchip/cover/20241130004057.7432-1-naoki@radxa.com/
> 
> FUKAUMI Naoki (4):
>    arm64: dts: rockchip: sort nodes in .dts for Radxa ROCK 5B
>    arm64: dts: rockchip: sort nodes in root node for Radxa ROCK 5B
>    arm64: dts: rockchip: sort properties in .dts for Radxa ROCK 5B
>    arm64: dts: rockchip: cosmetic changes for Radxa ROCK 5B
> 
>   .../boot/dts/rockchip/rk3588-rock-5b.dts      | 184 ++++++++----------
>   1 file changed, 86 insertions(+), 98 deletions(-)