Merge "ARM: dts: msm: Fix regulator naming for pm8010" (e9009838) · Commits · e / devices / android_kernel_fairphone_FP5

qcom/monaco-regulators.dtsi

+13 −12

Original line number	Diff line number	Diff line
		@@ -148,22 +148,23 @@
		};

		rpm-regulator-ldoa3 {
		status = "okay";
		qcom,resource-name = "rwmx";
		qcom,resource-id = <0>;
		proxy-supply = <&VDD_MXA_LEVEL>;

		VDD_MX_LEVEL:
		VDD_MXA_LEVEL:
		VDD_EBI_LEVEL:
		L3A_LEVEL:
		pm5100_l3_level: regulator-pm5100-l3-level {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "pm5100_l3_level";
		qcom,set = <3>;
		regulator-min-microvolt =
		<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt =
		<RPM_SMD_REGULATOR_LEVEL_BINNING>;
		qcom,init-voltage-level =
		<RPM_SMD_REGULATOR_LEVEL_TURBO>;
		qcom,proxy-consumer-enable;
		qcom,proxy-consumer-voltage =
		<RPM_SMD_REGULATOR_LEVEL_TURBO
		@@ -171,18 +172,18 @@
		qcom,use-voltage-level;
		};

		VDD_MX_LEVEL_AO:
		VDD_MXA_LEVEL_AO:
		VDD_EBI_LEVEL_AO:
		L3A_LEVEL_AO:
		pm5100_l3_level_ao: regulator-pm5100-l3-level-ao {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "pm5100_l3_level_ao";
		qcom,set = <3>;
		qcom,set = <1>;
		regulator-min-microvolt =
		<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt =
		<RPM_SMD_REGULATOR_LEVEL_BINNING>;
		qcom,init-voltage-level =
		<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		qcom,use-voltage-level;
		};

		@@ -453,7 +454,7 @@
		};
		};

		rpm-regulator-ldoc1 {
		rpm-regulator-ldom1 {
		status = "okay";
		L1C: pm8010_l1: regulator-l1 {
		regulator-min-microvolt = <1200000>;
		@@ -463,7 +464,7 @@
		};
		};

		rpm-regulator-ldoc2 {
		rpm-regulator-ldom2 {
		status = "okay";
		L2C: pm8010_l2: regulator-l2 {
		regulator-min-microvolt = <1200000>;
		@@ -473,7 +474,7 @@
		};
		};

		rpm-regulator-ldoc3 {
		rpm-regulator-ldom3 {
		status = "okay";
		L3C: pm8010_l3: regulator-l3 {
		regulator-min-microvolt = <1800000>;
		@@ -483,7 +484,7 @@
		};
		};

		rpm-regulator-ldoc4 {
		rpm-regulator-ldom4 {
		status = "okay";
		L4C: pm8010_l4: regulator-l4 {
		regulator-min-microvolt = <1800000>;
		@@ -493,7 +494,7 @@
		};
		};

		rpm-regulator-ldoc5 {
		rpm-regulator-ldom5 {
		status = "okay";
		L5C: pm8010_l5: regulator-l5 {
		regulator-min-microvolt = <2800000>;
		@@ -503,7 +504,7 @@
		};
		};

		rpm-regulator-ldoc6 {
		rpm-regulator-ldom6 {
		status = "okay";
		L6C: pm8010_l6: regulator-l6 {
		regulator-min-microvolt = <2800000>;
		@@ -513,7 +514,7 @@
		};
		};

		rpm-regulator-ldoc7 {
		rpm-regulator-ldom7 {
		status = "okay";
		L7C: pm8010_l7: regulator-l7 {
		regulator-min-microvolt = <3000000>;

qcom/pm8010-rpm-regulator.dtsi

+14 −14

Original line number	Diff line number	Diff line
		&rpm_bus {
		rpm-regulator-ldoc1 {
		rpm-regulator-ldom1 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoc";
		qcom,resource-name = "ldom";
		qcom,resource-id = <1>;
		qcom,regulator-type = <0>;
		qcom,regulator-hw-type = "pmic5-ldo";
		@@ -16,9 +16,9 @@
		};
		};

		rpm-regulator-ldoc2 {
		rpm-regulator-ldom2 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoc";
		qcom,resource-name = "ldom";
		qcom,resource-id = <2>;
		qcom,regulator-type = <0>;
		qcom,regulator-hw-type = "pmic5-ldo";
		@@ -33,9 +33,9 @@
		};
		};

		rpm-regulator-ldoc3 {
		rpm-regulator-ldom3 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoc";
		qcom,resource-name = "ldom";
		qcom,resource-id = <3>;
		qcom,regulator-type = <0>;
		qcom,regulator-hw-type = "pmic5-ldo";
		@@ -50,9 +50,9 @@
		};
		};

		rpm-regulator-ldoc4 {
		rpm-regulator-ldom4 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoc";
		qcom,resource-name = "ldom";
		qcom,resource-id = <4>;
		qcom,regulator-type = <0>;
		qcom,regulator-hw-type = "pmic5-ldo";
		@@ -67,9 +67,9 @@
		};
		};

		rpm-regulator-ldoc5 {
		rpm-regulator-ldom5 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoc";
		qcom,resource-name = "ldom";
		qcom,resource-id = <5>;
		qcom,regulator-type = <0>;
		qcom,regulator-hw-type = "pmic5-ldo";
		@@ -84,9 +84,9 @@
		};
		};

		rpm-regulator-ldoc6 {
		rpm-regulator-ldom6 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoc";
		qcom,resource-name = "ldom";
		qcom,resource-id = <6>;
		qcom,regulator-type = <0>;
		qcom,regulator-hw-type = "pmic5-ldo";
		@@ -101,9 +101,9 @@
		};
		};

		rpm-regulator-ldoc7 {
		rpm-regulator-ldom7 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoc";
		qcom,resource-name = "ldom";
		qcom,resource-id = <7>;
		qcom,regulator-type = <0>;
		qcom,regulator-hw-type = "pmic5-ldo";