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

Commit 77057cf5 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: Add custom1 and vana voltage supplys for msm8953"

parents e97f1ac1 ceee3f34

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

+7 −4
Original line number Diff line number Diff line
@@ -203,10 +203,13 @@ 
		cam_vio-supply = <&pm8953_l6>;

		cam_vdig-supply = <&pm8953_l2>;

		cam_vaf-supply = <&pm8953_l17>;

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

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

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

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

		cam_vana-supply = <&pm8953_l22>;

		cam_v_custom1-supply = <&pm8953_l23>;

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

						"cam_vana", "cam_v_custom1";

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

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

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

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

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_default

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

+5 −4
Original line number Diff line number Diff line
@@ -204,11 +204,12 @@ 
		cam_vdig-supply = <&pm8953_l2>;

		cam_vaf-supply = <&pm8953_l17>;

		cam_vana-supply = <&pm8953_l22>;

		cam_v_custom1-supply = <&pm8953_l23>;

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

						"cam_vana";

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

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

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

						"cam_vana", "cam_v_custom1";

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

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

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

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

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_default