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

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

Merge "msm: camera: sensor: Correct custom voltage on MSM8953"

parents a6a4e0c8 53209d2c

arch/arm64/boot/dts/qcom/msm8953-camera-sensor-cdp.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -207,8 +207,8 @@ 
		cam_v_custom1-supply = <&pm8953_l23>;

		cam_v_custom1-supply = <&pm8953_l23>;

		qcom,cam-vreg-name = "cam_vio", "cam_vdig", "cam_vaf",

		qcom,cam-vreg-name = "cam_vio", "cam_vdig", "cam_vaf",

						"cam_vana", "cam_v_custom1";

						"cam_vana", "cam_v_custom1";

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

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

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

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

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

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

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_default

		pinctrl-0 = <&cam_sensor_mclk0_default

arch/arm64/boot/dts/qcom/msm8953-camera-sensor-mtp.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -207,8 +207,8 @@ 
		cam_v_custom1-supply = <&pm8953_l23>;

		cam_v_custom1-supply = <&pm8953_l23>;

		qcom,cam-vreg-name = "cam_vio", "cam_vdig", "cam_vaf",

		qcom,cam-vreg-name = "cam_vio", "cam_vdig", "cam_vaf",

						"cam_vana", "cam_v_custom1";

						"cam_vana", "cam_v_custom1";

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

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

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

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

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

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

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_default

		pinctrl-0 = <&cam_sensor_mclk0_default