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

Commit 064afb57 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: Enable IMX274 on MSM8953 RCM/CDP"

parents f914a5d3 da70e77a

arch/arm/boot/dts/qcom/apq8053-camera-sensor-mtp.dtsi

+8 −6
Original line number Diff line number Diff line
@@ -63,14 +63,13 @@ 
		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <270>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vdig-supply = <&pm8953_s3>;

		cam_vana-supply = <&pm8953_l22>;

		qcom,ir-led-src = <&led_ir0>;

		qcom,ir-cut-src = <&ir_cut0>;

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

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

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

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

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

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

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_default1
@@ -79,13 +78,16 @@ 
				&cam_sensor_rear_vana_sleep1>;

		gpios = <&tlmm 26 0>,

			<&tlmm 40 0>,

			<&tlmm 46 0>;

			<&tlmm 46 0>,

			<&tlmm 134 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vana =  <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-vdig =  <2>;

		qcom,gpio-vana =  <3>;

		qcom,gpio-req-tbl-num = <0 1 2 3>;

		qcom,gpio-req-tbl-flags = <1 0 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK0",

			"CAM_RESET0",

			"CAM_VDIG",

			"CAM_VANA";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

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

+7 −4
Original line number Diff line number Diff line
@@ -98,10 +98,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/arm/boot/dts/qcom/msm8953-camera-sensor-mtp.dtsi

+5 −4
Original line number Diff line number Diff line
@@ -135,11 +135,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