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

Commit 70979abc 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: Change camera sensor regulator setting"

parents 77e56387 f5f49185

arch/arm/boot/dts/qti/apq8084-camera-sensor-cdp.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -133,8 +133,8 @@ 
		cam_vio-supply = <&pma8084_lvs4>;

		qcom,cam-vreg-name =  "cam_vana", "cam_vdig", "cam_vio";

		qcom,cam-vreg-type = <0 0 1>;

		qcom,cam-vreg-min-voltage = <2850000 1225000 0>;

		qcom,cam-vreg-max-voltage = <2850000 1225000 0>;

		qcom,cam-vreg-min-voltage = <2800000 1200000 0>;

		qcom,cam-vreg-max-voltage = <2800000 1200000 0>;

		qcom,cam-vreg-op-mode = <80000 105000 0>;

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 17 0>,
@@ -159,8 +159,8 @@ 
		cam_vio-supply = <&pma8084_lvs4>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vana", "cam_vio";

		qcom,cam-vreg-type = <0 0 1>;

		qcom,cam-vreg-min-voltage = <1225000 2850000 0>;

		qcom,cam-vreg-max-voltage = <1225000 2850000 0>;

		qcom,cam-vreg-min-voltage = <1200000 2800000 0>;

		qcom,cam-vreg-max-voltage = <1200000 2800000 0>;

		qcom,cam-vreg-op-mode = <105000 80000 0>;

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 17 0>,

arch/arm/boot/dts/qti/apq8084-camera-sensor-liquid.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -133,8 +133,8 @@ 
		cam_vio-supply = <&pma8084_lvs4>;

		qcom,cam-vreg-name =  "cam_vana", "cam_vdig", "cam_vio";

		qcom,cam-vreg-type = <0 0 1>;

		qcom,cam-vreg-min-voltage = <2850000 1225000 0>;

		qcom,cam-vreg-max-voltage = <2850000 1225000 0>;

		qcom,cam-vreg-min-voltage = <2800000 1200000 0>;

		qcom,cam-vreg-max-voltage = <2800000 1200000 0>;

		qcom,cam-vreg-op-mode = <80000 105000 0>;

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 17 0>,
@@ -159,8 +159,8 @@ 
		cam_vio-supply = <&pma8084_lvs4>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vana", "cam_vio";

		qcom,cam-vreg-type = <0 0 1>;

		qcom,cam-vreg-min-voltage = <1225000 2850000 0>;

		qcom,cam-vreg-max-voltage = <1225000 2850000 0>;

		qcom,cam-vreg-min-voltage = <1200000 2800000 0>;

		qcom,cam-vreg-max-voltage = <1200000 2800000 0>;

		qcom,cam-vreg-op-mode = <105000 80000 0>;

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 17 0>,

arch/arm/boot/dts/qti/apq8084-camera-sensor-mtp.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -133,8 +133,8 @@ 
		cam_vio-supply = <&pma8084_lvs4>;

		qcom,cam-vreg-name =  "cam_vana", "cam_vdig", "cam_vio";

		qcom,cam-vreg-type = <0 0 1>;

		qcom,cam-vreg-min-voltage = <2850000 1225000 0>;

		qcom,cam-vreg-max-voltage = <2850000 1225000 0>;

		qcom,cam-vreg-min-voltage = <2800000 1200000 0>;

		qcom,cam-vreg-max-voltage = <2800000 1200000 0>;

		qcom,cam-vreg-op-mode = <80000 105000 0>;

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 17 0>,
@@ -159,8 +159,8 @@ 
		cam_vio-supply = <&pma8084_lvs4>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vana", "cam_vio";

		qcom,cam-vreg-type = <0 0 1>;

		qcom,cam-vreg-min-voltage = <1225000 2850000 0>;

		qcom,cam-vreg-max-voltage = <1225000 2850000 0>;

		qcom,cam-vreg-min-voltage = <1200000 2800000 0>;

		qcom,cam-vreg-max-voltage = <1200000 2800000 0>;

		qcom,cam-vreg-op-mode = <105000 80000 0>;

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 17 0>,