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

Commit c94a306f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: remove CX and GFX explicit voltage support on msmsamarium"

parents 1350b055 6b8ab9aa

arch/arm/boot/dts/msmsamarium-camera-sensor-cdp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <90>;

		qcom,sensor-name = "imx135";

		qcom,vdd-cx-supply = <&pma8084_s2>;

		qcom,vdd-cx-supply = <&pma8084_s2_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		cam_vdig-supply = <&pma8084_l27>;

		cam_vana-supply = <&pma8084_l17>;
@@ -78,7 +78,7 @@ 
               qcom,csid-sd-index = <1>;

               qcom,mount-angle = <270>;

               qcom,sensor-name = "imx132";

               qcom,vdd-cx-supply = <&pma8084_s2>;

               qcom,vdd-cx-supply = <&pma8084_s2_corner>;

               qcom,vdd-cx-name = "qcom,vdd-cx";

               cam_vdig-supply = <&pma8084_l3>;

               cam_vana-supply = <&pma8084_l17>;

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

+0 −10
Original line number Diff line number Diff line
@@ -42,11 +42,6 @@ 
	/* PMA8084 S2 + S12 = 2 phase VDD_CX supply */

	rpm-regulator-smpa2 {

		status = "okay";

		pma8084_s2: regulator-s2 {

			regulator-min-microvolt = <550000>;

			regulator-max-microvolt = <1260000>;

			status = "okay";

		};

		pma8084_s2_corner: regulator-s2-corner {

			regulator-name = "8084_s2_corner";

			qcom,set = <3>;
@@ -118,11 +113,6 @@ 


	rpm-regulator-smpa7 {

		status = "okay";

		pma8084_s7: regulator-s7 {

			regulator-min-microvolt = <815000>;

			regulator-max-microvolt = <1050000>;

			status = "okay";

		};

		pma8084_s7_corner: regulator-s7-corner {

			compatible = "qcom,rpm-regulator-smd";

			regulator-name = "8084_s7_corner";