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

Commit 31e5f59b authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add support for irs1645 sensor" into dev/msm-4.14-camx

parents 54c14f3c 36b8ad52

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

+8 −5
Original line number Diff line number Diff line
@@ -389,15 +389,18 @@ 
		pinctrl-0 = <&cam_sensor_mclk3_active

				 &cam_sensor_active_iris>;

		pinctrl-1 = <&cam_sensor_mclk3_suspend

				 &cam_sensor_active_iris>;

				 &cam_sensor_suspend_iris>;

		gpios = <&tlmm 16 0>,

			<&tlmm 23 0>;

			<&tlmm 23 0>,

			<&tlmm 26 0>;

		gpio-reset = <1>;

		gpio-req-tbl-num = <0 1>;

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

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

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

		gpio-req-tbl-label = "CAMIF_MCLK3",

					"CAM_RESET3";

					"CAM_RESET3",

					"IMG_START";

		sensor-mode = <0>;

		cci-device = <1>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK3_CLK>;

arch/arm64/boot/dts/qcom/sm8150-pinctrl.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -3879,12 +3879,12 @@ 
		cam_sensor_active_iris: cam_sensor_active_iris {

			/* RESET IRIS */

			mux {

				pins = "gpio23";

				pins = "gpio23", "gpio26";

				function = "gpio";

			};



			config {

				pins = "gpio23";

				pins = "gpio23", "gpio26";

				bias-disable; /* No PULL */

				drive-strength = <2>; /* 2 MA */

			};
@@ -3893,12 +3893,12 @@ 
		cam_sensor_suspend_iris: cam_sensor_suspend_iris {

			/* RESET IRIS */

			mux {

				pins = "gpio23";

				pins = "gpio23", "gpio26";

				function = "gpio";

			};



			config {

				pins = "gpio23";

				pins = "gpio23", "gpio26";

				bias-pull-down; /* PULL DOWN */

				drive-strength = <2>; /* 2 MA */

				output-low;