Merge "ARM: dts: msm: Remove generic labels for regulators" (ad1ac51d) · Commits · e / devices / android_kernel_fairphone_FP5

qcom/blair-atp.dtsi

+228 −0

Original line number	Diff line number	Diff line
		@@ -40,146 +40,286 @@
		/* Disable all PM6125 and PMR735a rpm-regulators */
		rpm-regulator-smpa6 {
		status = "disabled";
		regulator-s6 {
		status = "disabled";
		};
		};

		rpm-regulator-smpa7 {
		status = "disabled";
		regulator-s7 {
		status = "disabled";
		};
		};

		rpm-regulator-smpa8 {
		status = "disabled";
		regulator-s8 {
		status = "disabled";
		};

		S3A_LEVEL {
		status = "disabled";
		};

		S3A_LEVEL_ao {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa1 {
		status = "disabled";
		regulator-l1 {
		status = "disabled";
		};

		regulator-l1-level {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa2 {
		status = "disabled";
		regulator-l2 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa3 {
		status = "disabled";
		regulator-l3 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa4 {
		status = "disabled";
		regulator-l4 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa5 {
		status = "disabled";
		regulator-l5 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa6 {
		status = "disabled";
		regulator-l6 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa7 {
		status = "disabled";
		regulator-l7 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa8 {
		status = "disabled";
		regulator-l8 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa9 {
		status = "disabled";
		regulator-l9 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa10 {
		status = "disabled";
		regulator-l10 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa11 {
		status = "disabled";
		regulator-l11 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa12 {
		status = "disabled";
		regulator-l12 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa13 {
		status = "disabled";
		regulator-l13 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa14 {
		status = "disabled";
		regulator-l14 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa15 {
		status = "disabled";
		regulator-l15 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa16 {
		status = "disabled";
		regulator-l16 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa17 {
		status = "disabled";
		regulator-l17 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa18 {
		status = "disabled";
		regulator-l18 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa19 {
		status = "disabled";
		regulator-l19 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa20 {
		status = "disabled";
		regulator-l20 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa21 {
		status = "disabled";
		regulator-l21 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa22 {
		status = "disabled";
		regulator-l22 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa23 {
		status = "disabled";
		regulator-l23 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa24 {
		status = "disabled";
		regulator-l24 {
		status = "disabled";
		};
		};

		rpm-regulator-smpe1 {
		status = "disabled";
		regulator-s1 {
		status = "disabled";
		};

		mx_cdev {
		status = "disabled";
		};
		};

		rpm-regulator-smpe2 {
		status = "disabled";
		regulator-s2 {
		status = "disabled";
		};

		regulator-s2-level {
		status = "disabled";
		};

		regulator-s2-floor-level {
		status = "disabled";
		};

		regulator-s2-level-ao {
		status = "disabled";
		};

		cx_cdev {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe1 {
		status = "disabled";
		regulator-l1 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe2 {
		status = "disabled";
		regulator-l2 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe3 {
		status = "disabled";
		regulator-l3 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe4 {
		status = "disabled";
		regulator-l4 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe5 {
		status = "disabled";
		regulator-l5 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe6 {
		status = "disabled";
		regulator-l6 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe7 {
		status = "disabled";
		regulator-l7 {
		status = "disabled";
		};
		};
		};

		@@ -191,6 +331,50 @@
		#include "pm6150l-rpm-regulator.dtsi"
		#include "holi-regulators-pm6350.dtsi"

		/* Enable explicitly disabled regulator resources nodes */
		&rpm_bus {
		/* Enable gfx_cdev for PM6350 */
		rpm-regulator-smpa3 {
		regulator-s3-level {
		status = "okay";
		};

		regulator-s3-level-ao {
		status = "okay";
		};

		gfx-cdev {
		status = "okay";
		};
		};

		/* Enable mx_cdev for PM6350 */
		rpm-regulator-smpa5 {
		regulator-s5-level {
		status = "okay";
		};

		regulator-s5-floor-level {
		status = "okay";
		};

		regulator-s5-level-ao {
		status = "okay";
		};

		mx-cdev-lvl {
		status = "okay";
		};
		};

		/* Enable mx_cdev for PM6150A */
		rpm-regulator-smpe1 {
		cx-cdev-lvl {
		status = "okay";
		};
		};
		};

		#include "holi-atp.dtsi"

		&qusb_phy0 {
		@@ -222,3 +406,47 @@
		qcom,bt-vdd-pa-supply = <&L10E>; /* CH0 */
		qcom,bt-vdd-xtal-supply = <&L7A>; /* XO */
		};

		&mdss_dsi_phy0 {
		vdda-0p9-supply = <&S5A_LEVEL>;
		};

		&dispcc {
		vdd_cx-supply = <&S1E_LEVEL>; /* VDD_CX_LEVEL */
		};

		&gpucc {
		vdd_cx-supply = <&S1E_LEVEL>; /* VDD_CX_LEVEL */
		vdd_mx-supply = <&S5A_LEVEL>; /* VDD_MX_LEVEL */
		vdd_gx-supply = <&S3A_LEVEL>; /* VDD_GFX_LEVEL */
		};

		&gpu_cx_gdsc {
		parent-supply = <&S1E_LEVEL>; /* VDD_CX_LEVEL */
		};

		&gpu_gx_gdsc {
		parent-supply = <&S3A_LEVEL>; /* VDD_GFX_LEVEL */
		};

		&gcc {
		vdd_cx-supply = <&S1E_LEVEL>; /* VDD_CX_LEVEL */
		vdd_mx-supply = <&S5A_LEVEL>; /* VDD_MX_LEVEL */
		};

		&msm_gpu {
		vdd-parent-supply = <&S3A_LEVEL>; /* VDD_GFX_LEVEL */
		};

		&pil_turing {
		vdd_cx-supply = <&S1E_LEVEL>; /* VDD_CX_LEVEL */
		};

		&pil_modem {
		vdd_cx-supply = <&S1E_LEVEL>; /* VDD_CX_LEVEL */
		};

		&pil_lpass {
		vdd_lpi_cx-supply = <&L1A_LEVEL>;
		vdd_lpi_mx-supply = <&L17A_LEVEL>;
		};

qcom/blair.dtsi

+13 −24

Original line number	Diff line number	Diff line
		@@ -1219,8 +1219,8 @@
		compatible = "qcom,blair-gcc", "syscon";
		reg = <0x1400000 0x1f0000>;
		reg_names = "cc_base";
		vdd_cx-supply = <&VDD_CX_LEVEL>;
		vdd_mx-supply = <&VDD_MX_LEVEL>;
		vdd_cx-supply = <&S2E_LEVEL>;
		vdd_mx-supply = <&S1E_LEVEL>;
		clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
		<&rpmcc RPM_SMD_XO_A_CLK_SRC>,
		<&sleep_clk>;
		@@ -1233,7 +1233,7 @@
		compatible = "qcom,blair-dispcc", "syscon";
		reg = <0x5f00000 0x20000>;
		reg-names = "cc_base";
		vdd_cx-supply = <&VDD_CX_LEVEL>;
		vdd_cx-supply = <&S2E_LEVEL>;
		clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
		<&gcc GCC_DISP_GPLL0_DIV_CLK_SRC>;
		clock-names = "bi_tcxo", "gcc_disp_gpll0_clk";
		@@ -1245,9 +1245,9 @@
		compatible = "qcom,blair-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 = <&S2E_LEVEL>;
		vdd_mx-supply = <&S1E_LEVEL>;
		vdd_gx-supply = <&S8A_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>;
		@@ -2896,9 +2896,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";

		@@ -2936,7 +2936,7 @@
		compatible = "qcom,pil-tz-generic";
		reg = <0xb000000 0x100000>;

		vdd_cx-supply = <&VDD_CX_LEVEL>;
		vdd_cx-supply = <&S2E_LEVEL>;
		qcom,vdd_cx-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 100000>;
		qcom,proxy-reg-names = "vdd_cx";

		@@ -2982,7 +2982,7 @@
		clock-names = "xo";
		qcom,proxy-clock-names = "xo";

		vdd_cx-supply = <&VDD_CX_LEVEL>;
		vdd_cx-supply = <&S2E_LEVEL>;
		qcom,vdd_cx-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 100000>;
		qcom,proxy-reg-names = "vdd_cx";

		@@ -3359,18 +3359,6 @@
		#include "blair-usb.dtsi"
		#include "ipcc-test-holi.dtsi"

		&L2A {
		regulator-min-microvolt = <1170000>;
		regulator-max-microvolt = <1304000>;
		qcom,init-voltage = <1170000>;
		};

		&L3A {
		regulator-min-microvolt = <1100000>;
		regulator-max-microvolt = <1300000>;
		qcom,init-voltage = <1100000>;
		};

		&L7A {
		regulator-min-microvolt = <720000>;
		};
		@@ -3436,12 +3424,12 @@
		};

		&gpu_cx_gdsc {
		parent-supply = <&VDD_CX_LEVEL>;
		parent-supply = <&S2E_LEVEL>;
		status = "ok";
		};

		&gpu_gx_gdsc {
		parent-supply = <&VDD_GFX_LEVEL>;
		parent-supply = <&S8A_LEVEL>;
		status = "ok";
		};

		@@ -3455,6 +3443,7 @@

		&msm_gpu {
		qcom,chipid = <0x06010901>;
		vdd-parent-supply = <&S8A_LEVEL>;

		/delete-node/qcom,gpu-pwrlevel-bins;

qcom/holi-gpu.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>;

qcom/holi-pm6125-overlay.dtsi

+55 −19

Original line number	Diff line number	Diff line

		&mdss_dsi_phy0 {
		vdda-0p9-supply = <&S1E_LEVEL>;
		};
		@@ -7,8 +6,7 @@
		vdda-1p2-supply = <&L4A>;
		};

		&soc {
		icnss: qcom,icnss@C800000 {
		&icnss {
		vdd-cx-mx-supply = <&L2E>;
		vdd-1.8-xo-supply = <&L16A>;
		vdd-1.3-rfa-supply = <&L2A>;
		@@ -19,11 +17,49 @@
		qcom,vdd-3.3-ch0-config = <3000000 3312000>;
		};

		bluetooth: bt_wcn3990 {
		&bluetooth {
		qcom,bt-vdd-io-supply = <&L9A>; /* IO */
		qcom,bt-vdd-core-supply = <&L2A>; /* RFA */
		qcom,bt-vdd-pa-supply = <&L23A>; /* CH0 */
		qcom,bt-vdd-xtal-supply = <&L16A>; /* XO */
		};

		&dispcc {
		vdd_cx-supply = <&S2E_LEVEL>; /* VDD_CX_LEVEL */
		};

		&gpucc {
		vdd_cx-supply = <&S2E_LEVEL>; /* VDD_CX_LEVEL */
		vdd_mx-supply = <&S1E_LEVEL>; /* VDD_MX_LEVEL */
		vdd_gx-supply = <&S8A_LEVEL>; /* VDD_GFX_LEVEL */
		};

		&gpu_cx_gdsc {
		parent-supply = <&S2E_LEVEL>; /* VDD_CX_LEVEL */
		};

		&gpu_gx_gdsc {
		parent-supply = <&S8A_LEVEL>; /* VDD_GFX_LEVEL */
		};

		&gcc {
		vdd_cx-supply = <&S2E_LEVEL>; /* VDD_CX_LEVEL */
		vdd_mx-supply = <&S1E_LEVEL>; /* VDD_MX_LEVEL */
		};

		&msm_gpu {
		vdd-parent-supply = <&S8A_LEVEL>; /* VDD_GFX_LEVEL */
		};

		&pil_turing {
		vdd_cx-supply = <&S2E_LEVEL>; /* VDD_CX_LEVEL */
		};

		&pil_modem {
		vdd_cx-supply = <&S2E_LEVEL>; /* VDD_CX_LEVEL */
		};

		&pil_lpass {
		vdd_lpi_cx-supply = <&L1A_LEVEL>;
		vdd_lpi_mx-supply = <&L17A_LEVEL>;
		};

qcom/holi-regulators-pm6125.dtsi

+206 −24

Original line number	Diff line number	Diff line
		@@ -39,165 +39,333 @@
		/delete-node/ rpm-regulator-ldoe5;
		/delete-node/ rpm-regulator-ldoe7;

		/* Disable PM6350 and PM6150L rpm-regulators */
		/*
		* Disable PM6350 and PM6150L rpm-regulators which are not been used
		* for holi-pm6125.
		*/
		rpm-regulator-smpa1 {
		status = "disabled";

		regulator-s1 {
		status = "disabled";
		};
		};

		rpm-regulator-smpa2 {
		status = "disabled";

		regulator-s2 {
		status = "disabled";
		};
		};

		/* Disable gfx_cdev for PM6350 */
		rpm-regulator-smpa3 {
		status = "disabled";

		regulator-s3 {
		status = "disabled";
		};

		regulator-s3-level {
		status = "disabled";
		};

		regulator-s3-level-ao {
		status = "disabled";
		};

		gfx-cdev {
		status = "disabled";
		};
		};

		/* Disable mx_cdev for PM6150A */
		rpm-regulator-smpa5 {
		status = "disabled";

		regulator-s5 {
		status = "disabled";
		};

		regulator-s5-level {
		status = "disabled";
		};

		regulator-s5-floor-level {
		status = "disabled";
		};

		regulator-s5-level-ao {
		status = "disabled";
		};

		mx-cdev-lvl {
		status = "disabled";
		};
		};

		rpm-regulator-bobe {
		status = "disabled";

		regulator-pm6150a-bob {
		status = "disabled";
		};

		regulator-pm6150a-bob-ao {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa1 {
		status = "disabled";
		regulator-l1 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa2 {
		status = "disabled";
		regulator-l2 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa3 {
		status = "disabled";
		regulator-l3 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa4 {
		status = "disabled";
		regulator-l4 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa5 {
		status = "disabled";
		regulator-l5 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa6 {
		status = "disabled";
		regulator-l6 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa7 {
		status = "disabled";
		regulator-l7 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa8 {
		status = "disabled";
		regulator-l8 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa9 {
		status = "disabled";
		regulator-l9 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa10 {
		status = "disabled";
		regulator-l10 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa11 {
		status = "disabled";
		regulator-l11 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa12 {
		status = "disabled";
		regulator-l12 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa13 {
		status = "disabled";
		regulator-l13 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa14 {
		status = "disabled";
		regulator-l14 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa15 {
		status = "disabled";
		regulator-l15 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa16 {
		status = "disabled";
		regulator-l16 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa17 {
		status = "disabled";
		regulator-l17 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa18 {
		status = "disabled";
		regulator-l18 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa19 {
		status = "disabled";
		regulator-l19 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa20 {
		status = "disabled";
		regulator-l20 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa21 {
		status = "disabled";
		regulator-l21 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoa22 {
		status = "disabled";
		regulator-l22 {
		status = "disabled";
		};
		};

		rpm-regulator-bobe {
		/* Disable cx_cdev for PM6150A */
		rpm-regulator-smpe1 {
		status = "disabled";

		regulator-s1 {
		status = "disabled";
		};

		rpm-regulator-smpe1 {
		cx-cdev-lvl {
		status = "disabled";
		};
		};

		rpm-regulator-smpe8 {
		status = "disabled";
		regulator-s8 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe1 {
		status = "disabled";
		regulator-l1 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe2 {
		status = "disabled";
		regulator-l2 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe3 {
		status = "disabled";
		regulator-l3 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe4 {
		status = "disabled";
		regulator-l4 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe5 {
		status = "disabled";
		regulator-l5 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe6 {
		status = "disabled";
		regulator-l6 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe7 {
		status = "disabled";
		regulator-l7 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe8 {
		status = "disabled";
		regulator-l8 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe9 {
		status = "disabled";
		regulator-l9 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe10 {
		status = "disabled";
		regulator-l10 {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe11 {
		status = "disabled";
		regulator-l11 {
		status = "disabled";
		};
		};
		};

		@@ -205,6 +373,16 @@
		#include "pmr735a-rpm-regulator.dtsi"

		&rpm_bus {
		rpm-regulator-smpa5 {
		status = "okay";
		S5A: pm6125_s5: regulator-s5 {
		regulator-min-microvolt = <382000>;
		regulator-max-microvolt = <1120000>;
		qcom,init-voltage = <952000>;
		status = "okay";
		};
		};

		rpm-regulator-smpa6 {
		status = "okay";
		S6A: pm6125_s6: regulator-s6 {
		@@ -231,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";
		@@ -245,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";
		@@ -259,6 +435,7 @@

		/* Dummy node */
		gfx_cdev: gfx-cdev {
		status = "disabled";
		};

		};
		@@ -268,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";
		@@ -284,9 +460,9 @@
		rpm-regulator-ldoa2 {
		status = "okay";
		L2A: pm6125_l2: regulator-l2 {
		regulator-min-microvolt = <1100000>;
		regulator-max-microvolt = <1300000>;
		qcom,init-voltage = <1100000>;
		regulator-min-microvolt = <1170000>;
		regulator-max-microvolt = <1304000>;
		qcom,init-voltage = <1170000>;
		status = "okay";
		};
		};
		@@ -294,9 +470,9 @@
		rpm-regulator-ldoa3 {
		status = "okay";
		L3A: pm6125_l3: regulator-l3 {
		regulator-min-microvolt = <1170000>;
		regulator-max-microvolt = <1304000>;
		qcom,init-voltage = <1170000>;
		regulator-min-microvolt = <1100000>;
		regulator-max-microvolt = <1300000>;
		qcom,init-voltage = <1100000>;
		status = "okay";
		};
		};
		@@ -343,10 +519,13 @@

		rpm-regulator-ldoa8 {
		status = "okay";
		proxy-supply = <&pm6125_l8>;
		L8A: pm6125_l8: regulator-l8 {
		regulator-min-microvolt = <1100000>;
		regulator-max-microvolt = <1304000>;
		qcom,init-voltage = <1200000>;
		qcom,proxy-consumer-enable;
		qcom,proxy-consumer-current = <857000>;
		status = "okay";
		};
		};
		@@ -393,10 +572,13 @@

		rpm-regulator-ldoa13 {
		status = "okay";
		proxy-supply = <&pm6125_l13>;
		L13A: pm6125_l13: regulator-l13 {
		regulator-min-microvolt = <1650000>;
		regulator-max-microvolt = <1980000>;
		qcom,init-voltage = <1650000>;
		qcom,proxy-consumer-enable;
		qcom,proxy-consumer-current = <62000>;
		status = "okay";
		};
		};
		@@ -436,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";
		@@ -524,8 +705,7 @@
		status = "okay";
		qcom,resource-name = "rwmx";
		qcom,resource-id = <0>;
		proxy-supply = <&VDD_MX_LEVEL>;
		VDD_MX_LEVEL:
		proxy-supply = <&pmr735a_s1_level>;
		S1E_LEVEL: pmr735a_s1_level: regulator-s1-level {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "pmr735a_s1_level";
		@@ -543,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";
		@@ -557,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";
		@@ -571,6 +749,7 @@

		/* Dummy node */
		mx_cdev: mx-cdev-lvl {
		status = "disabled";
		};
		};

		@@ -580,11 +759,10 @@
		status = "okay";
		qcom,resource-name = "rwcx";
		qcom,resource-id = <0>;
		proxy-supply = <&VDD_CX_LEVEL>;
		VDD_CX_LEVEL:
		proxy-supply = <&pmr735a_s2_level>;
		S2E_LEVEL: pmr735a_s2_level: regulator-s2-level {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "pmr735a_s1_level";
		regulator-name = "pmr735a_s2_level";
		qcom,set = <3>;
		regulator-min-microvolt =
		<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		@@ -599,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";
		@@ -613,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";
		@@ -627,15 +803,19 @@

		/* Dummy node */
		cx_cdev: cx-cdev-lvl {
		status = "disabled";
		};
		};

		rpm-regulator-ldoe1 {
		status = "okay";
		proxy-supply = <&pmr735a_l1>;
		L1E: pmr735a_l1: regulator-l1 {
		regulator-min-microvolt = <570000>;
		regulator-max-microvolt = <650000>;
		qcom,init-voltage = <600000>;
		qcom,proxy-consumer-enable;
		qcom,proxy-consumer-current = <62000>;
		status = "okay";
		};
		};
		@@ -707,5 +887,7 @@
		reg = <0x162F000 0x84>;
		regulator-name = "refgen";
		regulator-enable-ramp-delay = <5>;
		proxy-supply = <&refgen>;
		qcom,proxy-consumer-enable;
		};
		};