Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb7e48eb authored by Devesh Jhunjhunwala's avatar Devesh Jhunjhunwala
Browse files

ARM: dts: msm: Replace stub regulators with RPM-controlled regulators



Update the mdmcalifornium-regulator.dtsi file to use the actual
regulators defined in the msm-pmdcalifornium-rpm-regulator.dtsi
file in place of the stub regulators.

Change-Id: I569bebbc63cfc34c3f9f7d0a049080050dc8669e
Signed-off-by: default avatarDevesh Jhunjhunwala <deveshj@codeaurora.org>
parent cc16e83b
Loading
Loading
Loading
Loading
+223 −145
Original line number Diff line number Diff line
@@ -13,160 +13,238 @@

#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>

/* Stub regulators */

/ {
&rpm_bus {
	/* PMDCALIFORNIUM S1 = VDD_MSS supply */
	rpm-regulator-smpa1 {
		status = "okay";
		pmdcalifornium_s1: regulator-s1 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_s1";
			regulator-min-microvolt = <800000>;
			regulator-max-microvolt = <800000>;
			qcom,init-voltage = <800000>;
			status = "okay";
		};
	};

	rpm-regulator-smpa2 {
		status = "okay";
		pmdcalifornium_s2: regulator-s2 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_s2";
			regulator-min-microvolt = <1256000>;
			regulator-max-microvolt = <1256000>;
			qcom,init-voltage = <1256000>;
			status = "okay";
		};
	};

	rpm-regulator-smpa3 {
		status = "okay";
		pmdcalifornium_s3: regulator-s3 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_s3";
			regulator-min-microvolt = <1024000>;
			regulator-max-microvolt = <1024000>;
			qcom,init-voltage = <1024000>;
			status = "okay";
		};
	};

	rpm-regulator-smpa4 {
		status = "okay";
		pmdcalifornium_s4: regulator-s4 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_s4";
			regulator-min-microvolt = <1856000>;
			regulator-max-microvolt = <1856000>;
			qcom,init-voltage = <1856000>;
			status = "okay";
		};
	};

	/* PMDCALIFORNIUM S5 = VDD_CX supply */
	rpm-regulator-smpa5 {
		status = "okay";
		pmdcalifornium_s5_level: regulator-s5-level {
		compatible = "qcom,stub-regulator";
			compatible = "qcom,rpm-smd-regulator";
			regulator-name = "pmdcalifornium_s5_level";
			qcom,set = <3>;
		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
			regulator-min-microvolt =
					<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
			regulator-max-microvolt =
					<RPM_SMD_REGULATOR_LEVEL_TURBO>;
			qcom,use-voltage-level;
		};

		pmdcalifornium_s5_level_ao: regulator-s5-level-ao {
		compatible = "qcom,stub-regulator";
			compatible = "qcom,rpm-smd-regulator";
			regulator-name = "pmdcalifornium_s5_level_ao";
			qcom,set = <1>;
		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
			regulator-min-microvolt =
					<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
			regulator-max-microvolt =
					<RPM_SMD_REGULATOR_LEVEL_TURBO>;
			qcom,use-voltage-level;
		};

		pmdcalifornium_s5_floor_level: regulator-s5-floor-level {
		compatible = "qcom,stub-regulator";
			compatible = "qcom,rpm-smd-regulator";
			regulator-name = "pmdcalifornium_s5_floor_level";
			qcom,set = <3>;
		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
			regulator-min-microvolt =
					<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
			regulator-max-microvolt =
					<RPM_SMD_REGULATOR_LEVEL_TURBO>;
			qcom,use-voltage-floor-level;
		};
	};

	rpm-regulator-ldoa1 {
		status = "okay";
		pmdcalifornium_l1: regulator-l1 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_l1";
			regulator-min-microvolt = <1224000>;
			regulator-max-microvolt = <1224000>;
			qcom,init-voltage = <1224000>;
			status = "okay";
		};
	};

	rpm-regulator-ldoa2 {
		status = "okay";
		pmdcalifornium_l2: regulator-l2 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_l2";
			regulator-min-microvolt = <1200000>;
			regulator-max-microvolt = <1200000>;
			qcom,init-voltage = <1200000>;
			status = "okay";
		};
	};

	rpm-regulator-ldoa3 {
		status = "okay";
		pmdcalifornium_l3: regulator-l3 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_l3";
			regulator-min-microvolt = <1000000>;
			regulator-max-microvolt = <1000000>;
			qcom,init-voltage = <1000000>;
			status = "okay";
		};
	};

	rpm-regulator-ldoa4 {
		status = "okay";
		pmdcalifornium_l4: regulator-l4 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_l4";
			regulator-min-microvolt = <928000>;
			regulator-max-microvolt = <928000>;
			qcom,init-voltage = <928000>;
			status = "okay";
		};
	};

	rpm-regulator-ldoa5 {
		status = "okay";
		pmdcalifornium_l5: regulator-l5 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_l5";
			regulator-min-microvolt = <1800000>;
			regulator-max-microvolt = <1800000>;
			qcom,init-voltage = <1800000>;
			status = "okay";
		};
	};

	rpm-regulator-ldoa6 {
		status = "okay";
		pmdcalifornium_l6: regulator-l6 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_l6";
			regulator-min-microvolt = <1800000>;
			regulator-max-microvolt = <1800000>;
			qcom,init-voltage = <1800000>;
			status = "okay";
		};
	};

	rpm-regulator-ldoa7 {
		status = "okay";
		pmdcalifornium_l7: regulator-l7 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_l7";
			regulator-min-microvolt = <1800000>;
			regulator-max-microvolt = <2848000>;
			qcom,init-voltage = <1800000>;
			status = "okay";
		};
	};

	rpm-regulator-ldoa8 {
		status = "okay";
		pmdcalifornium_l8: regulator-l8 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_l8";
			regulator-min-microvolt = <1000000>;
			regulator-max-microvolt = <1000000>;
			qcom,init-voltage = <1000000>;
			status = "okay";
		};
	};

	/* PMDCALIFORNIUM L9 = VDD_MX supply */
	rpm-regulator-ldoa9 {
		status = "okay";
		pmdcalifornium_l9_level: regulator-l9-level {
		compatible = "qcom,stub-regulator";
			compatible = "qcom,rpm-smd-regulator";
			regulator-name = "pmdcalifornium_l9_level";
			qcom,set = <3>;
		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
			regulator-min-microvolt =
					<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
			regulator-max-microvolt =
					<RPM_SMD_REGULATOR_LEVEL_TURBO>;
			qcom,use-voltage-level;
		};
	};

	rpm-regulator-ldoa10 {
		status = "okay";
		pmdcalifornium_l10: regulator-l10 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_l10";
			regulator-min-microvolt = <3088000>;
			regulator-max-microvolt = <3088000>;
			qcom,init-voltage = <3088000>;
			status = "okay";
		};
	};

	rpm-regulator-ldoa11 {
		status = "okay";
		pmdcalifornium_l11: regulator-l11 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_l11";
			regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
			regulator-max-microvolt = <2848000>;
			qcom,init-voltage = <1800000>;
			status = "okay";
		};
	};

	rpm-regulator-ldoa12 {
		status = "okay";
		pmdcalifornium_l12: regulator-l12 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_l12";
			regulator-min-microvolt = <2704000>;
			regulator-max-microvolt = <2704000>;
			qcom,init-voltage = <2704000>;
			status = "okay";
		};
	};

	rpm-regulator-ldoa13 {
		status = "okay";
		pmdcalifornium_l13: regulator-l13 {
		compatible = "qcom,stub-regulator";
			regulator-name = "pmdcalifornium_l13";
			regulator-min-microvolt = <1800000>;
			regulator-max-microvolt = <2848000>;
			qcom,init-voltage = <1800000>;
			status = "okay";
		};
	};
};

&soc {
	codec_buck_vreg: codec_buck_vreg {
		compatible = "regulator-fixed";
		regulator-name = "codec_1.8v";