Merge "arm/dt: mpq8092: Add rpm regulator for s8_corner" (371b9c69) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

arch/arm/boot/dts/mpq8092-regulator.dtsi

+20 −8

Original line number	Diff line number	Diff line
		@@ -61,14 +61,6 @@
		status = "okay";
		};

		pma8084_s8: regulator@2900 {
		regulator-min-microvolt = <1050000>;
		regulator-max-microvolt = <1050000>;
		qcom,enable-time = <500>;
		qcom,pull-down-enable = <1>;
		status = "okay";
		};

		pma8084_s12: regulator@3500 {
		regulator-min-microvolt = <900000>;
		regulator-max-microvolt = <900000>;
		@@ -322,3 +314,23 @@
		};
		};

		&rpm_bus {
		rpm-regulator-smpa8 {
		status = "okay";
		pma8084_s8: regulator-s8 {
		regulator-min-microvolt = <500000>;
		regulator-max-microvolt = <1050000>;
		status = "okay";
		};

		pma8084_s8_corner: regulator-s8-corner {
		compatible = "qcom,rpm-regulator-smd";
		regulator-name = "8084_s8_corner";
		qcom,set = <3>;
		regulator-min-microvolt = <1>;
		regulator-max-microvolt = <7>;
		qcom,consumer-supplies = "vdd_dig", "";
		qcom,use-voltage-corner;
		};
		};
		};

+8 −0

Original line number	Diff line number	Diff line
		@@ -410,6 +410,13 @@
		compatible = "qcom,tz-log";
		reg = <0xfe805720 0x1000>;
		};

		rpm_bus: qcom,rpm-smd {
		compatible = "qcom,rpm-smd";
		rpm-channel-name = "rpm_requests";
		rpm-channel-type = <15>; /* SMD_APPS_RPM */
		rpm-standalone; /* TODO: remove this after bring up */
		};
		};

		&gdsc_venus {
		@@ -448,5 +455,6 @@
		status = "ok";
		};

		/include/ "msm-pma8084-rpm-regulator.dtsi"
		/include/ "msm-pma8084.dtsi"
		/include/ "mpq8092-regulator.dtsi"