fix regulator names to match with schematic. fix properties to match
with vendor kernel.
Signed-off-by: FUKAUMI Naoki <naoki@xxxxxxxxx>
---
.../boot/dts/rockchip/rk3588-rock-5b.dts | 80 +++++++++----------
1 file changed, 40 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
index 3cd8c63151db..95f2f4dbf12d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -461,7 +461,7 @@ &pwm1 {
};
&saradc {
- vref-supply = <&avcc_1v8_s0>;
+ vref-supply = <&vcca_1v8_s0>;
status = "okay";
};
@@ -588,12 +588,12 @@ rk806_dvs3_null: dvs3-null-pins {
};
regulators {
- vdd_gpu_s0: vdd_gpu_mem_s0: dcdc-reg1 {
+ vdd_gpu_s0: dcdc-reg1 {
+ regulator-name = "vdd_gpu_s0";
regulator-boot-on;
regulator-min-microvolt = <550000>;
regulator-max-microvolt = <950000>;
regulator-ramp-delay = <12500>;
- regulator-name = "vdd_gpu_s0";
regulator-enable-ramp-delay = <400>;
regulator-state-mem {
@@ -601,13 +601,13 @@ regulator-state-mem {
};
};
- vdd_cpu_lit_s0: vdd_cpu_lit_mem_s0: dcdc-reg2 {
+ vdd_cpu_lit_s0: dcdc-reg2 {
+ regulator-name = "vdd_cpu_lit_s0";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <550000>;
regulator-max-microvolt = <950000>;
regulator-ramp-delay = <12500>;
- regulator-name = "vdd_cpu_lit_s0";
regulator-state-mem {
regulator-off-in-suspend;
@@ -615,26 +615,26 @@ regulator-state-mem {
};
vdd_log_s0: dcdc-reg3 {
+ regulator-name = "vdd_log_s0";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <675000>;
regulator-max-microvolt = <750000>;
regulator-ramp-delay = <12500>;
- regulator-name = "vdd_log_s0";
regulator-state-mem {
- regulator-off-in-suspend;
+ regulator-on-in-suspend;
regulator-suspend-microvolt = <750000>;
};
};
- vdd_vdenc_s0: vdd_vdenc_mem_s0: dcdc-reg4 {
+ vdd_vdenc_s0: dcdc-reg4 {
+ regulator-name = "vdd_vdenc_s0";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <550000>;
regulator-max-microvolt = <950000>;
regulator-ramp-delay = <12500>;
- regulator-name = "vdd_vdenc_s0";
regulator-state-mem {
regulator-off-in-suspend;
@@ -642,12 +642,12 @@ regulator-state-mem {
};
vdd_ddr_s0: dcdc-reg5 {
+ regulator-name = "vdd_ddr_s0";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <675000>;
regulator-max-microvolt = <900000>;
regulator-ramp-delay = <12500>;
- regulator-name = "vdd_ddr_s0";
regulator-state-mem {
regulator-off-in-suspend;
@@ -656,9 +656,9 @@ regulator-state-mem {
};
vdd2_ddr_s3: dcdc-reg6 {
+ regulator-name = "vdd2_ddr_s3";
regulator-always-on;
regulator-boot-on;
- regulator-name = "vdd2_ddr_s3";
regulator-state-mem {
regulator-on-in-suspend;
@@ -666,12 +666,11 @@ regulator-state-mem {
};
vcc_2v0_pldo_s3: dcdc-reg7 {
+ regulator-name = "vcc_2v0_pldo_s3";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <2000000>;
regulator-max-microvolt = <2000000>;
- regulator-ramp-delay = <12500>;
- regulator-name = "vdd_2v0_pldo_s3";
regulator-state-mem {
regulator-on-in-suspend;
@@ -680,11 +679,11 @@ regulator-state-mem {
};
vcc_3v3_s3: dcdc-reg8 {
+ regulator-name = "vcc_3v3_s3";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- regulator-name = "vcc_3v3_s3";
regulator-state-mem {
regulator-on-in-suspend;
@@ -693,9 +692,9 @@ regulator-state-mem {
};
vddq_ddr_s0: dcdc-reg9 {
+ regulator-name = "vddq_ddr_s0";
regulator-always-on;
regulator-boot-on;
- regulator-name = "vddq_ddr_s0";
regulator-state-mem {
regulator-off-in-suspend;
@@ -703,11 +702,11 @@ regulator-state-mem {
};
vcc_1v8_s3: dcdc-reg10 {
+ regulator-name = "vcc_1v8_s3";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-name = "vcc_1v8_s3";
regulator-state-mem {
regulator-on-in-suspend;
@@ -715,63 +714,63 @@ regulator-state-mem {
};
};
- avcc_1v8_s0: pldo-reg1 {
+ vcca_1v8_s0: pldo-reg1 {
+ regulator-name = "vcca_1v8_s0";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-name = "avcc_1v8_s0";
regulator-state-mem {
- regulator-off-in-suspend;
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <1800000>;
};
};
vcc_1v8_s0: pldo-reg2 {
+ regulator-name = "vcc_1v8_s0";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-name = "vcc_1v8_s0";
regulator-state-mem {
- regulator-off-in-suspend;
+ regulator-on-in-suspend;
regulator-suspend-microvolt = <1800000>;
};
};
- avdd_1v2_s0: pldo-reg3 {
+ vdda_1v2_s0: pldo-reg3 {
+ regulator-name = "vdda_1v2_s0";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
- regulator-name = "avdd_1v2_s0";
regulator-state-mem {
regulator-off-in-suspend;
};
};
- vcc_3v3_s0: pldo-reg4 {
+ vcca_3v3_s0: pldo-reg4 {
+ regulator-name = "vcca_3v3_s0";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- regulator-ramp-delay = <12500>;
- regulator-name = "vcc_3v3_s0";
regulator-state-mem {
- regulator-off-in-suspend;
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
};
};
vccio_sd_s0: pldo-reg5 {
+ regulator-name = "vccio_sd_s0";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
- regulator-ramp-delay = <12500>;
- regulator-name = "vccio_sd_s0";
regulator-state-mem {
regulator-off-in-suspend;
@@ -779,11 +778,11 @@ regulator-state-mem {
};
pldo6_s3: pldo-reg6 {
+ regulator-name = "pldo6_s3";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-name = "pldo6_s3";
regulator-state-mem {
regulator-on-in-suspend;
@@ -792,11 +791,11 @@ regulator-state-mem {
};
vdd_0v75_s3: nldo-reg1 {
+ regulator-name = "vdd_0v75_s3";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <750000>;
regulator-max-microvolt = <750000>;
- regulator-name = "vdd_0v75_s3";
regulator-state-mem {
regulator-on-in-suspend;
@@ -804,37 +803,38 @@ regulator-state-mem {
};
};
- vdd_ddr_pll_s0: nldo-reg2 {
+ vdda_ddr_pll_s0: nldo-reg2 {
+ regulator-name = "vdda_ddr_pll_s0";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <850000>;
regulator-max-microvolt = <850000>;
- regulator-name = "vdd_ddr_pll_s0";
regulator-state-mem {
- regulator-off-in-suspend;
+ regulator-on-in-suspend;
regulator-suspend-microvolt = <850000>;
};
};
- avdd_0v75_s0: nldo-reg3 {
+ vdda_0v75_s0: nldo-reg3 {
+ regulator-name = "vdda_0v75_s0";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <750000>;
regulator-max-microvolt = <750000>;
- regulator-name = "avdd_0v75_s0";
regulator-state-mem {
- regulator-off-in-suspend;
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <750000>;
};
};
- vdd_0v85_s0: nldo-reg4 {
+ vdda_0v85_s0: nldo-reg4 {
+ regulator-name = "vdda_0v85_s0";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <850000>;
regulator-max-microvolt = <850000>;
- regulator-name = "vdd_0v85_s0";
regulator-state-mem {
regulator-off-in-suspend;
@@ -842,11 +842,11 @@ regulator-state-mem {
};
vdd_0v75_s0: nldo-reg5 {
+ regulator-name = "vdd_0v75_s0";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <750000>;
regulator-max-microvolt = <750000>;
- regulator-name = "vdd_0v75_s0";
regulator-state-mem {
regulator-off-in-suspend;
--
2.43.0
