Merge "ARM: dts: msm: Add iris support on msm8998 and sdm660" (1e059e00) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/boot/dts/qcom/msm-pm660l.dtsi

+0 −3

Original line number	Diff line number	Diff line
		@@ -380,9 +380,6 @@
		qcom,led-name = "led:switch_1";
		qcom,led-mask = <4>;
		qcom,default-led-trigger = "switch1_trigger";
		pinctrl-names = "led_enable","led_disable";
		pinctrl-0 = <&led_enable>;
		pinctrl-1 = <&led_disable>;
		};
		};

arch/arm/boot/dts/qcom/msm-pmi8998.dtsi

+0 −3

Original line number	Diff line number	Diff line
		@@ -762,9 +762,6 @@
		qcom,led-name = "led:switch_1";
		qcom,led-mask = <4>;
		qcom,default-led-trigger = "switch1_trigger";
		pinctrl-names = "led_enable","led_disable";
		pinctrl-0 = <&led_enable>;
		pinctrl-1 = <&led_disable>;
		};
		};
		};

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

+48 −6

Original line number	Diff line number	Diff line
		@@ -334,19 +334,22 @@
		qcom,gpio-no-mux = <0>;
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cam_sensor_mclk1_active
		&cam_sensor_front_active>;
		&cam_sensor_front_active &led_enable>;
		pinctrl-1 = <&cam_sensor_mclk1_suspend
		&cam_sensor_front_suspend>;
		&cam_sensor_front_suspend &led_disable>;
		gpios = <&tlmm 14 0>,
		<&tlmm 28 0>,
		<&pm8998_gpios 9 0>;
		<&pm8998_gpios 9 0>,
		<&tlmm 21 0>;
		qcom,gpio-reset = <1>;
		qcom,gpio-vdig = <2>;
		qcom,gpio-req-tbl-num = <0 1 2>;
		qcom,gpio-req-tbl-flags = <1 0 0>;
		qcom,gpio-flash-en = <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_MCLK2",
		"CAM_RESET2",
		"CAM_VDIG";
		"CAM_VDIG",
		"FLASH_EN";
		qcom,sensor-position = <1>;
		qcom,sensor-mode = <0>;
		qcom,cci-master = <1>;
		@@ -356,6 +359,45 @@
		clock-names = "cam_src_clk", "cam_clk";
		qcom,clock-rates = <24000000 0>;
		};

		qcom,camera@3 {
		cell-index = <3>;
		compatible = "qcom,camera";
		reg = <0x03>;
		qcom,csiphy-sd-index = <1>;
		qcom,csid-sd-index = <1>;
		qcom,mount-angle = <270>;
		qcom,led-flash-src = <&led_flash1>;
		cam_vio-supply = <&pm8998_lvs1>;
		cam_vana-supply = <&pm8998_l22>;
		cam_vdig-supply = <&pm8998_s3>;
		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
		qcom,cam-vreg-min-voltage =
		<0 2864000 1352000>;
		qcom,cam-vreg-max-voltage =
		<0 2864000 1352000>;
		qcom,cam-vreg-op-mode = <0 80000 105000>;
		qcom,gpio-no-mux = <0>;
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cam_sensor_mclk3_active
		&cam_sensor_front_iris_active>;
		pinctrl-1 = <&cam_sensor_mclk3_suspend
		&cam_sensor_front_iris_suspend>;
		gpios = <&tlmm 16 0>,
		<&tlmm 23 0>;
		qcom,gpio-reset = <1>;
		qcom,gpio-req-tbl-num = <0 1>;
		qcom,gpio-req-tbl-flags = <1 0>;
		qcom,gpio-req-tbl-label = "CAMIF_MCLK3",
		"CAM_RESET3";
		qcom,sensor-position = <1>;
		qcom,sensor-mode = <0>;
		qcom,cci-master = <1>;
		clocks = <&clock_mmss clk_mclk3_clk_src>,
		<&clock_mmss clk_mmss_camss_mclk3_clk>;
		clock-names = "cam_src_clk", "cam_clk";
		qcom,clock-rates = <24000000 0>;
		};
		};
		&pm8998_gpios {
		gpio@c800 { /* GPIO 9 - CAMERA SENSOR 2 VDIG */

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -11,6 +11,12 @@
		* GNU General Public License for more details.
		*/

		&soc {
		/delete-node/qcom,camera-flash@0;
		/delete-node/qcom,camera-flash@1;
		/delete-node/gpio-regulator@0;
		};

		&soc {
		tlmm: pinctrl@03400000 {
		cam_sensor_rear_active: cam_sensor_rear_active {
		@@ -132,19 +138,17 @@
		};
		};

		&soc {
		/delete-node/gpio-regulator@0;
		};

		&cci {
		/delete-node/qcom,camera@0;
		/delete-node/qcom,camera@1;
		/delete-node/qcom,camera@2;
		/delete-node/qcom,camera@3;
		/delete-node/qcom,eeprom@0;
		/delete-node/qcom,eeprom@1;
		/delete-node/qcom,eeprom@2;
		/delete-node/qcom,actuator@0;
		/delete-node/qcom,actuator@1;
		/delete-node/qcom,tof@0;
		/delete-node/qcom,ois@0;
		};

arch/arm/boot/dts/qcom/msm8998-interposer-camera-sensor-qrd.dtsi

+8 −4

Original line number	Diff line number	Diff line
		@@ -11,6 +11,12 @@
		* GNU General Public License for more details.
		*/

		&soc {
		/delete-node/qcom,camera-flash@0;
		/delete-node/qcom,camera-flash@1;
		/delete-node/gpio-regulator@0;
		};

		&soc {
		tlmm: pinctrl@03400000 {
		cam_sensor_rear_active: cam_sensor_rear_active {
		@@ -170,19 +176,17 @@
		};
		};

		&soc {
		/delete-node/gpio-regulator@0;
		};

		&cci {
		/delete-node/qcom,camera@0;
		/delete-node/qcom,camera@1;
		/delete-node/qcom,camera@2;
		/delete-node/qcom,camera@3;
		/delete-node/qcom,eeprom@0;
		/delete-node/qcom,eeprom@1;
		/delete-node/qcom,eeprom@2;
		/delete-node/qcom,actuator@0;
		/delete-node/qcom,actuator@1;
		/delete-node/qcom,tof@0;
		/delete-node/qcom,ois@0;
		};