From: FUKAUMI Naoki <naoki@radxa.com>
To: heiko@sntech.de
Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org,
dsimic@manjaro.org, devicetree@vger.kernel.org,
linux-rockchip@lists.infradead.org,
FUKAUMI Naoki <naoki@radxa.com>
Subject: [PATCH v6 7/7] arm64: dts: rockchip: Sort nodes for Radxa ROCK 5C
Date: Mon, 23 Dec 2024 01:39:26 +0000 [thread overview]
Message-ID: <20241223013926.1134-8-naoki@radxa.com> (raw)
In-Reply-To: <20241223013926.1134-1-naoki@radxa.com>
Sort nodes alphanumerically. No functional change.
Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
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 | 176 +++++++++---------
1 file changed, 88 insertions(+), 88 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
index 419730f06f8f..a3deae077233 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 {
+ compatible = "pwm-fan";
+ #cooling-cells = <2>;
+ cooling-levels = <0 64 128 192 255>;
+ fan-supply = <&vcc_5v0>;
+ pwms = <&pwm3 0 60000 0>;
};
hdmi0-con {
@@ -68,12 +65,14 @@ led-1 {
};
};
- fan {
- compatible = "pwm-fan";
- #cooling-cells = <2>;
- cooling-levels = <0 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 {
@@ -88,6 +87,50 @@ vcc3v3_pcie2x1l2: regulator-3v3-0 {
vin-supply = <&vcc_sysin>;
};
+ vcc_3v3_pmu: regulator-3v3-1 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc_3v3_pmu";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ vin-supply = <&vcc_3v3_s3>;
+ };
+
+ vcc_3v3_s0: regulator-3v3-2 {
+ 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-3 {
+ 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>;
+ };
+
vcc5v0_usb_host: regulator-5v0-0 {
compatible = "regulator-fixed";
enable-active-high;
@@ -112,36 +155,6 @@ vcc5v0_usb_otg0: regulator-5v0-1 {
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_pmu: regulator-3v3-1 {
- compatible = "regulator-fixed";
- regulator-name = "vcc_3v3_pmu";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- vin-supply = <&vcc_3v3_s3>;
- };
-
- vcc_3v3_s0: regulator-3v3-2 {
- 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-2 {
compatible = "regulator-fixed";
enable-active-high;
@@ -163,28 +176,15 @@ vcc_sysin: regulator-5v0-3 {
regulator-max-microvolt = <5000000>;
};
- 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-3 {
- 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,6 +399,12 @@ &pcie2x1l2 {
};
&pinctrl {
+ ethernet-phy {
+ gmac1_rstn: ethernet-phy-0 {
+ rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
leds {
led_0: led-0 {
rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -409,12 +415,6 @@ led_1: led-1 {
};
};
- ethernet-phy {
- gmac1_rstn: ethernet-phy-0 {
- rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
-
pcie {
pcie20x1_2_perstn_m0: pcie-0 {
rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -425,7 +425,17 @@ pow_en: regulator-3v3-0 {
};
};
+ regulators {
+ vcc_5v0_pwren_h: regulator-5v0-2 {
+ rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
usb {
+ usb_wifi_pwr: regulator-3v3-3 {
+ rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
usb_host_pwren_h: regulator-5v0-0 {
rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
};
@@ -433,16 +443,6 @@ usb_host_pwren_h: regulator-5v0-0 {
usb_otg_pwren_h: regulator-5v0-1 {
rockchip,pins = <0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
};
-
- usb_wifi_pwr: regulator-3v3-3 {
- rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
-
- regulators {
- vcc_5v0_pwren_h: regulator-5v0-2 {
- rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
- };
};
};
@@ -854,10 +854,6 @@ &uart2 {
status = "okay";
};
-&usbdp_phy0 {
- status = "okay";
-};
-
&usb_host0_ehci {
status = "okay";
};
@@ -879,7 +875,7 @@ &usb_host2_xhci {
status = "okay";
};
-&vop_mmu {
+&usbdp_phy0 {
status = "okay";
};
@@ -887,6 +883,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
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
WARNING: multiple messages have this Message-ID (diff)
From: FUKAUMI Naoki <naoki@radxa.com>
To: heiko@sntech.de
Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org,
dsimic@manjaro.org, devicetree@vger.kernel.org,
linux-rockchip@lists.infradead.org,
FUKAUMI Naoki <naoki@radxa.com>
Subject: [PATCH v6 7/7] arm64: dts: rockchip: Sort nodes for Radxa ROCK 5C
Date: Mon, 23 Dec 2024 01:39:26 +0000 [thread overview]
Message-ID: <20241223013926.1134-8-naoki@radxa.com> (raw)
In-Reply-To: <20241223013926.1134-1-naoki@radxa.com>
Sort nodes alphanumerically. No functional change.
Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
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 | 176 +++++++++---------
1 file changed, 88 insertions(+), 88 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
index 419730f06f8f..a3deae077233 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 {
+ compatible = "pwm-fan";
+ #cooling-cells = <2>;
+ cooling-levels = <0 64 128 192 255>;
+ fan-supply = <&vcc_5v0>;
+ pwms = <&pwm3 0 60000 0>;
};
hdmi0-con {
@@ -68,12 +65,14 @@ led-1 {
};
};
- fan {
- compatible = "pwm-fan";
- #cooling-cells = <2>;
- cooling-levels = <0 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 {
@@ -88,6 +87,50 @@ vcc3v3_pcie2x1l2: regulator-3v3-0 {
vin-supply = <&vcc_sysin>;
};
+ vcc_3v3_pmu: regulator-3v3-1 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc_3v3_pmu";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ vin-supply = <&vcc_3v3_s3>;
+ };
+
+ vcc_3v3_s0: regulator-3v3-2 {
+ 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-3 {
+ 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>;
+ };
+
vcc5v0_usb_host: regulator-5v0-0 {
compatible = "regulator-fixed";
enable-active-high;
@@ -112,36 +155,6 @@ vcc5v0_usb_otg0: regulator-5v0-1 {
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_pmu: regulator-3v3-1 {
- compatible = "regulator-fixed";
- regulator-name = "vcc_3v3_pmu";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- vin-supply = <&vcc_3v3_s3>;
- };
-
- vcc_3v3_s0: regulator-3v3-2 {
- 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-2 {
compatible = "regulator-fixed";
enable-active-high;
@@ -163,28 +176,15 @@ vcc_sysin: regulator-5v0-3 {
regulator-max-microvolt = <5000000>;
};
- 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-3 {
- 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,6 +399,12 @@ &pcie2x1l2 {
};
&pinctrl {
+ ethernet-phy {
+ gmac1_rstn: ethernet-phy-0 {
+ rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
leds {
led_0: led-0 {
rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -409,12 +415,6 @@ led_1: led-1 {
};
};
- ethernet-phy {
- gmac1_rstn: ethernet-phy-0 {
- rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
-
pcie {
pcie20x1_2_perstn_m0: pcie-0 {
rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -425,7 +425,17 @@ pow_en: regulator-3v3-0 {
};
};
+ regulators {
+ vcc_5v0_pwren_h: regulator-5v0-2 {
+ rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
usb {
+ usb_wifi_pwr: regulator-3v3-3 {
+ rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
usb_host_pwren_h: regulator-5v0-0 {
rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
};
@@ -433,16 +443,6 @@ usb_host_pwren_h: regulator-5v0-0 {
usb_otg_pwren_h: regulator-5v0-1 {
rockchip,pins = <0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
};
-
- usb_wifi_pwr: regulator-3v3-3 {
- rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
-
- regulators {
- vcc_5v0_pwren_h: regulator-5v0-2 {
- rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
- };
};
};
@@ -854,10 +854,6 @@ &uart2 {
status = "okay";
};
-&usbdp_phy0 {
- status = "okay";
-};
-
&usb_host0_ehci {
status = "okay";
};
@@ -879,7 +875,7 @@ &usb_host2_xhci {
status = "okay";
};
-&vop_mmu {
+&usbdp_phy0 {
status = "okay";
};
@@ -887,6 +883,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
next prev parent reply other threads:[~2024-12-23 1:39 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-23 1:39 [PATCH v6 0/7] arm64: dts: rockchip: Refine dts for Radxa ROCK 5C FUKAUMI Naoki
2024-12-23 1:39 ` FUKAUMI Naoki
2024-12-23 1:39 ` [PATCH v6 1/7] arm64: dts: rockchip: Change the function of the blue LED " FUKAUMI Naoki
2024-12-23 1:39 ` FUKAUMI Naoki
2024-12-23 1:39 ` [PATCH v6 2/7] arm64: dts: rockchip: Use a longer PWM period for the fan on " FUKAUMI Naoki
2024-12-23 1:39 ` FUKAUMI Naoki
2024-12-23 10:33 ` Dragan Simic
2024-12-23 10:33 ` Dragan Simic
2024-12-23 1:39 ` [PATCH v6 3/7] arm64: dts: rockchip: Remove the RTC and related nodes for " FUKAUMI Naoki
2024-12-23 1:39 ` FUKAUMI Naoki
2024-12-23 1:39 ` [PATCH v6 4/7] arm64: dts: rockchip: Add cd-gpios for sdmmc " FUKAUMI Naoki
2024-12-23 1:39 ` FUKAUMI Naoki
2024-12-23 1:39 ` [PATCH v6 5/7] arm64: dts: rockchip: Fix the properties of the PMIC regulators " FUKAUMI Naoki
2024-12-23 1:39 ` FUKAUMI Naoki
2024-12-23 1:39 ` [PATCH v6 6/7] arm64: dts: rockchip: Trivial changes " FUKAUMI Naoki
2024-12-23 1:39 ` FUKAUMI Naoki
2024-12-23 1:39 ` FUKAUMI Naoki [this message]
2024-12-23 1:39 ` [PATCH v6 7/7] arm64: dts: rockchip: Sort nodes " FUKAUMI Naoki
2024-12-27 15:18 ` [PATCH v6 0/7] arm64: dts: rockchip: Refine dts " Rob Herring (Arm)
2024-12-27 15:18 ` Rob Herring (Arm)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241223013926.1134-8-naoki@radxa.com \
--to=naoki@radxa.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dsimic@manjaro.org \
--cc=heiko@sntech.de \
--cc=krzk+dt@kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.