[PATCH v7 11/14] arm64: dts: rockchip: Sort nodes/properties for Radxa ROCK 5C
FUKAUMI Naoki
naoki at radxa.com
Mon Nov 10 02:03:13 PST 2025
Hi,
On 11/9/25 23:18, FUKAUMI Naoki wrote:
> Sort nodes/properties alphanumerically. No functional change.
>
> Signed-off-by: FUKAUMI Naoki <naoki at radxa.com>
> ---
> Changes in v7:
> - Reflect other commits, no functional change
> Changes in v6:
> - Reflect other commits, no functional change
> Changes in v5:
> - Reword commit message
> Changes in v4:
> - Reflect other commits, no functional change
> Changes in v3:
> - None
> Changes in v2:
> - New
> ---
> .../boot/dts/rockchip/rk3588s-rock-5c.dts | 162 +++++++++---------
> 1 file changed, 81 insertions(+), 81 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
> index 4e15c28f8a5fa..6ef9a5d8cd9c1 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
> @@ -25,15 +25,12 @@ chosen {
> stdout-path = "serial2:1500000n8";
> };
>
> - sound {
> - compatible = "audio-graph-card";
> - label = "rk3588-es8316";
> - dais = <&i2s0_8ch_p0>;
> - routing = "MIC2", "Mic Jack",
> - "Headphones", "HPOL",
> - "Headphones", "HPOR";
> - widgets = "Microphone", "Mic Jack",
> - "Headphone", "Headphones";
> + fan: fan {
> + compatible = "pwm-fan";
> + #cooling-cells = <2>;
> + cooling-levels = <0 64 128 192 255>;
This should be
cooling-levels = <0 24 44 64 128 192 255>;
I'll fix this in v8.
Best regards,
--
FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.
> + fan-supply = <&vcc_5v0>;
> + pwms = <&pwm3 0 60000 0>;
> };
>
> hdmi0-con {
> @@ -70,12 +67,14 @@ led-1 {
> };
> };
>
> - fan: fan {
> - compatible = "pwm-fan";
> - #cooling-cells = <2>;
> - cooling-levels = <0 24 44 64 128 192 255>;
> - fan-supply = <&vcc_5v0>;
> - pwms = <&pwm3 0 60000 0>;
> + vcc_1v1_nldo_s3: regulator-1v1 {
> + compatible = "regulator-fixed";
> + regulator-name = "vcc_1v1_nldo_s3";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <1100000>;
> + regulator-max-microvolt = <1100000>;
> + vin-supply = <&vcc_sysin>;
> };
>
> vcc3v3_pcie2x1l2: regulator-3v3-0 {
> @@ -90,6 +89,40 @@ vcc3v3_pcie2x1l2: regulator-3v3-0 {
> vin-supply = <&vcc_sysin>;
> };
>
> + vcc_3v3_s0: regulator-3v3-1 {
> + compatible = "regulator-fixed";
> + regulator-name = "vcc_3v3_s0";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + vin-supply = <&vcc_3v3_s3>;
> + };
> +
> + vdd_3v3: regulator-3v3-2 {
> + compatible = "regulator-fixed";
> + enable-active-high;
> + gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&usb_wifi_pwr>;
> + regulator-name = "vdd_3v3";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + vin-supply = <&vcc_3v3_s3>;
> + };
> +
> + vcca: regulator-4v0 {
> + compatible = "regulator-fixed";
> + regulator-name = "vcca";
> + regulator-always-on;
> + regulator-boot-on;
> + regulator-min-microvolt = <4000000>;
> + regulator-max-microvolt = <4000000>;
> + vin-supply = <&vcc_sysin>;
> + };
> +
> vcc5v_dcin: regulator-5v0-0 {
> compatible = "regulator-fixed";
> regulator-name = "vcc5v_dcin";
> @@ -123,26 +156,6 @@ vcc5v0_usb_otg0: regulator-5v0-2 {
> vin-supply = <&vcc_sysin>;
> };
>
> - vcc_1v1_nldo_s3: regulator-1v1 {
> - compatible = "regulator-fixed";
> - regulator-name = "vcc_1v1_nldo_s3";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <1100000>;
> - regulator-max-microvolt = <1100000>;
> - vin-supply = <&vcc_sysin>;
> - };
> -
> - vcc_3v3_s0: regulator-3v3-1 {
> - compatible = "regulator-fixed";
> - regulator-name = "vcc_3v3_s0";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <3300000>;
> - regulator-max-microvolt = <3300000>;
> - vin-supply = <&vcc_3v3_s3>;
> - };
> -
> vcc_5v0: regulator-5v0-3 {
> compatible = "regulator-fixed";
> enable-active-high;
> @@ -165,28 +178,15 @@ vcc_sysin: regulator-5v0-4 {
> vin-supply = <&vcc5v_dcin>;
> };
>
> - vcca: regulator-4v0 {
> - compatible = "regulator-fixed";
> - regulator-name = "vcca";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <4000000>;
> - regulator-max-microvolt = <4000000>;
> - vin-supply = <&vcc_sysin>;
> - };
> -
> - vdd_3v3: regulator-3v3-2 {
> - compatible = "regulator-fixed";
> - enable-active-high;
> - gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&usb_wifi_pwr>;
> - regulator-name = "vdd_3v3";
> - regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <3300000>;
> - regulator-max-microvolt = <3300000>;
> - vin-supply = <&vcc_3v3_s3>;
> + sound {
> + compatible = "audio-graph-card";
> + label = "rk3588-es8316";
> + dais = <&i2s0_8ch_p0>;
> + routing = "MIC2", "Mic Jack",
> + "Headphones", "HPOL",
> + "Headphones", "HPOR";
> + widgets = "Microphone", "Mic Jack",
> + "Headphone", "Headphones";
> };
> };
>
> @@ -399,27 +399,27 @@ &package_thermal {
>
> trips {
> package_fan0: package-fan0 {
> - temperature = <55000>;
> hysteresis = <2000>;
> + temperature = <55000>;
> type = "active";
> };
>
> package_fan1: package-fan1 {
> - temperature = <65000>;
> hysteresis = <2000>;
> + temperature = <65000>;
> type = "active";
> };
> };
>
> cooling-maps {
> map0 {
> - trip = <&package_fan0>;
> cooling-device = <&fan THERMAL_NO_LIMIT 1>;
> + trip = <&package_fan0>;
> };
>
> map1 {
> - trip = <&package_fan1>;
> cooling-device = <&fan 2 THERMAL_NO_LIMIT>;
> + trip = <&package_fan1>;
> };
> };
> };
> @@ -437,6 +437,12 @@ &pd_gpu {
> };
>
> &pinctrl {
> + ethernet {
> + gmac1_rstn: gmac1-rstn {
> + rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> + };
> +
> leds {
> io_led: io-led {
> rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
> @@ -447,12 +453,6 @@ power_led: power-led {
> };
> };
>
> - ethernet {
> - gmac1_rstn: gmac1-rstn {
> - rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> - };
> -
> pcie {
> pcie20x1_2_perstn_m0: pcie20x1-2-perstn-m0 {
> rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
> @@ -463,6 +463,12 @@ pow_en: pow-en {
> };
> };
>
> + regulators {
> + vcc_5v0_pwren_h: vcc-5v0-pwren-h {
> + rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
> + };
> + };
> +
> usb {
> usb_host_pwren_h: usb-host-pwren-h {
> rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
> @@ -476,12 +482,6 @@ usb_wifi_pwr: usb-wifi-pwr {
> rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
> };
> };
> -
> - regulators {
> - vcc_5v0_pwren_h: vcc-5v0-pwren-h {
> - rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
> - };
> - };
> };
>
> &pwm3 {
> @@ -500,8 +500,8 @@ &sdhci {
> cap-mmc-highspeed;
> mmc-hs400-1_8v;
> mmc-hs400-enhanced-strobe;
> - no-sdio;
> no-sd;
> + no-sdio;
> non-removable;
> vmmc-supply = <&vcc_3v3_s0>;
> vqmmc-supply = <&vccio_flash>;
> @@ -514,8 +514,8 @@ &sdmmc {
> cap-sd-highspeed;
> cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
> disable-wp;
> - no-sdio;
> no-mmc;
> + no-sdio;
> pinctrl-names = "default";
> pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd>;
> sd-uhs-sdr104;
> @@ -538,12 +538,12 @@ flash at 0 {
> };
>
> &spi2 {
> - status = "okay";
> assigned-clocks = <&cru CLK_SPI2>;
> assigned-clock-rates = <200000000>;
> num-cs = <1>;
> pinctrl-names = "default";
> pinctrl-0 = <&spi2m2_cs0 &spi2m2_pins>;
> + status = "okay";
>
> pmic at 0 {
> compatible = "rockchip,rk806";
> @@ -898,10 +898,6 @@ &uart2 {
> status = "okay";
> };
>
> -&usbdp_phy0 {
> - status = "okay";
> -};
> -
> &usb_host0_ehci {
> status = "okay";
> };
> @@ -923,7 +919,7 @@ &usb_host2_xhci {
> status = "okay";
> };
>
> -&vop_mmu {
> +&usbdp_phy0 {
> status = "okay";
> };
>
> @@ -931,6 +927,10 @@ &vop {
> status = "okay";
> };
>
> +&vop_mmu {
> + status = "okay";
> +};
> +
> &vp0 {
> vp0_out_hdmi0: endpoint at ROCKCHIP_VOP2_EP_HDMI0 {
> reg = <ROCKCHIP_VOP2_EP_HDMI0>;
More information about the Linux-rockchip
mailing list