Sort nodes alphanumerically. No functional change.
Signed-off-by: FUKAUMI Naoki <naoki@xxxxxxxxx>
---
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
