ARM: dts: msm: Remove generic labels for regulators

Remove generic (VDD_XX) labels for holi-pm6350 and
holi-pm6125 regulators.

Change-Id: I9bb4755f428d7848efe8aa7d43ca05a96fe07ae0
This commit is contained in:
Ashish Chavan 2021-05-24 22:58:30 +05:30
commit 7f2278ce4f
5 changed files with 19 additions and 38 deletions

View file

@ -3443,6 +3443,7 @@
&msm_gpu {
qcom,chipid = <0x06010901>;
vdd-parent-supply = <&S8A_LEVEL>;
/delete-node/qcom,gpu-pwrlevel-bins;

View file

@ -32,7 +32,7 @@ msm_gpu: qcom,kgsl-3d0@5900000 {
vddcx-supply = <&gpu_cx_gdsc>;
vdd-supply = <&gpu_gx_gdsc>;
vdd-parent-supply = <&VDD_GFX_LEVEL>;
vdd-parent-supply = <&S3A_LEVEL>;
vdd-parent-min-corner = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
qcom,chipid = <0x06010900>;

View file

@ -409,7 +409,6 @@
qcom,resource-name = "rwgx";
qcom,resource-id = <0>;
qcom,always-wait-for-ack;
VDD_GFX_LEVEL:
S8A_LEVEL: pm6125_s8_level: regulator-s8-level {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pm6125_s8_level";
@ -423,7 +422,6 @@
qcom,use-voltage-level;
};
VDD_GFX_LEVEL_AO:
S8A_LEVEL_AO: pm6125_s8_level_ao: regulator-s8-level-ao {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pm6125_s8_level_ao";
@ -447,7 +445,6 @@
status = "okay";
qcom,resource-name = "rwlc";
qcom,resource-id = <0>;
VDD_LPI_CX_LEVEL:
L1A_LEVEL: pm6125_l1_level: regulator-l1-level {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pm6125_l1_level";
@ -621,7 +618,6 @@
status = "okay";
qcom,resource-name = "rwlm";
qcom,resource-id = <0>;
VDD_LPI_MX_LEVEL:
L17A_LEVEL: pm6125_l17_level: regulator-l17-level {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pm6125_l17_level";
@ -710,7 +706,6 @@
qcom,resource-name = "rwmx";
qcom,resource-id = <0>;
proxy-supply = <&pmr735a_s1_level>;
VDD_MX_LEVEL:
S1E_LEVEL: pmr735a_s1_level: regulator-s1-level {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pmr735a_s1_level";
@ -728,7 +723,6 @@
qcom,use-voltage-level;
};
VDD_MX_FLOOR_LEVEL:
S1E_FLOOR_LEVEL:
pmr735a_s1_floor_level: regulator-s1-floor-level {
compatible = "qcom,rpm-smd-regulator";
@ -742,7 +736,6 @@
qcom,always-send-voltage;
};
VDD_MX_LEVEL_AO:
S1E_LEVEL_AO: pmr735a_s1_level_ao: regulator-s1-level-ao {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pmr735a_s1_level_ao";
@ -767,7 +760,6 @@
qcom,resource-name = "rwcx";
qcom,resource-id = <0>;
proxy-supply = <&pmr735a_s2_level>;
VDD_CX_LEVEL:
S2E_LEVEL: pmr735a_s2_level: regulator-s2-level {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pmr735a_s2_level";
@ -785,7 +777,6 @@
qcom,use-voltage-level;
};
VDD_CX_FLOOR_LEVEL:
S2E_FLOOR_LEVEL:
pmr735a_s2_floor_level: regulator-s2-floor-level {
compatible = "qcom,rpm-smd-regulator";
@ -799,7 +790,6 @@
qcom,always-send-voltage;
};
VDD_CX_LEVEL_AO:
S2E_LEVEL_AO: pmr735a_s2_level_ao: regulator-s2-level-ao {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pmr735a_s2_level_ao";

View file

@ -27,7 +27,6 @@
qcom,resource-name = "rwgx";
qcom,resource-id = <0>;
qcom,always-wait-for-ack;
VDD_GFX_LEVEL:
S3A_LEVEL: pm6350_s3_level: regulator-s3-level {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pm6350_s3_level";
@ -41,7 +40,6 @@
qcom,use-voltage-level;
};
VDD_GFX_LEVEL_AO:
S3A_LEVEL_AO: pm6350_s3_level_ao: regulator-s3-level-ao {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pm6350_s3_level_ao";
@ -55,7 +53,7 @@
gfx_cdev: gfx-cdev {
compatible = "qcom,regulator-cooling-device";
regulator-cdev-supply = <&VDD_GFX_LEVEL_AO>;
regulator-cdev-supply = <&S3A_LEVEL_AO>;
regulator-levels = <RPM_SMD_REGULATOR_LEVEL_RETENTION
RPM_SMD_REGULATOR_LEVEL_SVS_PLUS>;
#cooling-cells = <2>;
@ -67,8 +65,7 @@
status = "okay";
qcom,resource-name = "rwmx";
qcom,resource-id = <0>;
proxy-supply = <&VDD_MX_LEVEL>;
VDD_MX_LEVEL:
proxy-supply = <&S5A_LEVEL>;
S5A_LEVEL: pm6350_s5_level: regulator-s5-level {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pm6350_s5_level";
@ -86,7 +83,6 @@
qcom,use-voltage-level;
};
VDD_MX_FLOOR_LEVEL:
S5A_FLOOR_LEVEL:
pm6350_s5_floor_level: regulator-s5-floor-level {
compatible = "qcom,rpm-smd-regulator";
@ -100,7 +96,6 @@
qcom,always-send-voltage;
};
VDD_MX_LEVEL_AO:
S5A_LEVEL_AO: pm6350_s5_level_ao: regulator-s5-level-ao {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pm6350_s5_level_ao";
@ -114,7 +109,7 @@
mx_cdev: mx-cdev-lvl {
compatible = "qcom,regulator-cooling-device";
regulator-cdev-supply = <&VDD_MX_LEVEL>;
regulator-cdev-supply = <&S5A_LEVEL>;
regulator-levels = <RPM_SMD_REGULATOR_LEVEL_RETENTION
RPM_SMD_REGULATOR_LEVEL_SVS_PLUS>;
#cooling-cells = <2>;
@ -126,7 +121,6 @@
status = "okay";
qcom,resource-name = "rwlc";
qcom,resource-id = <0>;
VDD_LPI_CX_LEVEL:
L1A_LEVEL: pm6350_l1_level: regulator-l1-level {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pm6350_l1_level";
@ -297,7 +291,6 @@
status = "okay";
qcom,resource-name = "rwlm";
qcom,resource-id = <0>;
VDD_LPI_MX_LEVEL:
L17A_LEVEL: pm6350_l17_level: regulator-l17-level {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pm6350_l17_level";
@ -390,8 +383,7 @@
status = "okay";
qcom,resource-name = "rwcx";
qcom,resource-id = <0>;
proxy-supply = <&VDD_CX_LEVEL>;
VDD_CX_LEVEL:
proxy-supply = <&S1E_LEVEL>;
S1E_LEVEL: pm6150a_s1_level: regulator-s1-level {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pm6150a_s1_level";
@ -409,7 +401,6 @@
qcom,use-voltage-level;
};
VDD_CX_FLOOR_LEVEL:
S1E_FLOOR_LEVEL:
pm6150a_s1_floor_level: regulator-s1-floor-level {
compatible = "qcom,rpm-smd-regulator";
@ -423,7 +414,6 @@
qcom,always-send-voltage;
};
VDD_CX_LEVEL_AO:
S1E_LEVEL_AO: pm6150a_s1_level_ao: regulator-s1-level-ao {
compatible = "qcom,rpm-smd-regulator";
regulator-name = "pm6150a_s1_level_ao";
@ -437,7 +427,7 @@
cx_cdev: cx-cdev-lvl {
compatible = "qcom,regulator-cooling-device";
regulator-cdev-supply = <&VDD_CX_FLOOR_LEVEL>;
regulator-cdev-supply = <&S1E_FLOOR_LEVEL>;
regulator-levels = <RPM_SMD_REGULATOR_LEVEL_RETENTION
RPM_SMD_REGULATOR_LEVEL_SVS_PLUS>;
#cooling-cells = <2>;

View file

@ -1224,8 +1224,8 @@
compatible = "qcom,holi-gcc", "syscon";
reg = <0x1400000 0x1f0000>;
reg_names = "cc_base";
vdd_cx-supply = <&VDD_CX_LEVEL>;
vdd_mx-supply = <&VDD_MX_LEVEL>;
vdd_cx-supply = <&S1E_LEVEL>;
vdd_mx-supply = <&S5A_LEVEL>;
clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
<&rpmcc RPM_SMD_XO_A_CLK_SRC>,
<&sleep_clk>;
@ -1238,7 +1238,7 @@
compatible = "qcom,holi-dispcc", "syscon";
reg = <0x5f00000 0x20000>;
reg-names = "cc_base";
vdd_cx-supply = <&VDD_CX_LEVEL>;
vdd_cx-supply = <&S1E_LEVEL>;
clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
<&gcc GCC_DISP_GPLL0_DIV_CLK_SRC>;
clock-names = "bi_tcxo", "gcc_disp_gpll0_clk";
@ -1250,9 +1250,9 @@
compatible = "qcom,holi-gpucc", "syscon";
reg = <0x5990000 0x9000>;
reg-names = "cc_base";
vdd_cx-supply = <&VDD_CX_LEVEL>;
vdd_mx-supply = <&VDD_MX_LEVEL>;
vdd_gx-supply = <&VDD_GFX_LEVEL>;
vdd_cx-supply = <&S1E_LEVEL>;
vdd_mx-supply = <&S5A_LEVEL>;
vdd_gx-supply = <&S3A_LEVEL>;
clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>, <&gcc GCC_GPU_GPLL0_CLK_SRC>,
<&gcc GCC_GPU_GPLL0_DIV_CLK_SRC>,
<&gcc GCC_GPU_SNOC_DVM_GFX_CLK>;
@ -2901,9 +2901,9 @@
clock-names = "xo";
qcom,proxy-clock-names = "xo";
vdd_lpi_cx-supply = <&VDD_LPI_CX_LEVEL>;
vdd_lpi_cx-supply = <&L1A_LEVEL>;
qcom,vdd_lpi_cx-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 0>;
vdd_lpi_mx-supply = <&VDD_LPI_MX_LEVEL>;
vdd_lpi_mx-supply = <&L17A_LEVEL>;
qcom,vdd_lpi_mx-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 0>;
qcom,proxy-reg-names = "vdd_lpi_cx", "vdd_lpi_mx";
@ -2940,7 +2940,7 @@
compatible = "qcom,pil-tz-generic";
reg = <0xb000000 0x100000>;
vdd_cx-supply = <&VDD_CX_LEVEL>;
vdd_cx-supply = <&S1E_LEVEL>;
qcom,vdd_cx-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 100000>;
qcom,proxy-reg-names = "vdd_cx";
@ -2985,7 +2985,7 @@
clock-names = "xo";
qcom,proxy-clock-names = "xo";
vdd_cx-supply = <&VDD_CX_LEVEL>;
vdd_cx-supply = <&S1E_LEVEL>;
qcom,vdd_cx-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 100000>;
qcom,proxy-reg-names = "vdd_cx";
@ -3445,12 +3445,12 @@
};
&gpu_cx_gdsc {
parent-supply = <&VDD_CX_LEVEL>;
parent-supply = <&S1E_LEVEL>;
status = "ok"
};
&gpu_gx_gdsc {
parent-supply = <&VDD_GFX_LEVEL>;
parent-supply = <&S3A_LEVEL>;
status = "ok"
};