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

Commit 2f50f976 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 imx477 dual sensor for apq8053"

parents b7c73edf 49c89fa7

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

+44 −4
Original line number Diff line number Diff line
@@ -62,14 +62,14 @@ 
		qcom,csiphy-sd-index = <0>;

		qcom,csid-sd-index = <0>;

		qcom,mount-angle = <270>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vdig-supply = <&pm8953_l2>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vana-supply = <&pm8953_l22>;

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

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

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

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

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

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

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

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

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

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

		pinctrl-0 = <&cam_sensor_mclk0_default
@@ -99,4 +99,44 @@ 
		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};



	qcom,camera@1 {

		cell-index = <1>;

		compatible = "qcom,camera";

		reg = <0x1>;

		qcom,csiphy-sd-index = <1>;

		qcom,csid-sd-index = <1>;

		qcom,mount-angle = <270>;

		cam_vdig-supply = <&pm8953_l1>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vana-supply = <&pm8953_l17>;

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

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

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

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

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

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

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_default1>;

		pinctrl-1 = <&cam_sensor_mclk0_sleep

				&cam_sensor_rear_sleep1>;

		gpios = <&tlmm 26 0>,

			<&tlmm 129 0>,

			<&tlmm 130 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

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

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

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

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <1>;

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};

};

arch/arm/boot/dts/qcom/msm8953-regulator.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 
		status = "okay";

		pm8953_l1: regulator-l1 {

			regulator-min-microvolt = <1000000>;

			regulator-max-microvolt = <1000000>;

			regulator-max-microvolt = <1100000>;

			qcom,init-voltage = <1000000>;

			status = "okay";

		};
@@ -288,7 +288,7 @@ 
		status = "okay";

		pm8953_l22: regulator-l22 {

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2800000>;

			regulator-max-microvolt = <2850000>;

			qcom,init-voltage = <2800000>;

			status = "okay";

		};