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

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

Merge "ARM: dts: msm: Add shared gpio for front/iris camera on SDM845" into dev/msm-4.9-camx

parents f0bd00db e029763a

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

+4 −0
Original line number Diff line number Diff line
@@ -97,6 +97,10 @@ 
	qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";

		status = "ok";

		shared-gpios = <8>;

		pinctrl-names = "cam_res_mgr_default", "cam_res_mgr_suspend";

		pinctrl-0 = <&cam_res_mgr_active>;

		pinctrl-1 = <&cam_res_mgr_suspend>;

	};



	actuator_rear: qcom,actuator@0 {

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

+4 −0
Original line number Diff line number Diff line
@@ -97,6 +97,10 @@ 
	qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";

		status = "ok";

		shared-gpios = <8>;

		pinctrl-names = "cam_res_mgr_default", "cam_res_mgr_suspend";

		pinctrl-0 = <&cam_res_mgr_active>;

		pinctrl-1 = <&cam_res_mgr_suspend>;

	};



	actuator_rear: qcom,actuator@0 {

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

+38 −8
Original line number Diff line number Diff line
@@ -2985,12 +2985,12 @@ 
		cam_sensor_front_active: cam_sensor_front_active {

			/* RESET  AVDD_LDO*/

			mux {

				pins = "gpio28", "gpio8";

				pins = "gpio28";

				function = "gpio";

			};



			config {

				pins = "gpio28", "gpio8";

				pins = "gpio28";

				bias-disable; /* No PULL */

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

			};
@@ -3014,12 +3014,12 @@ 
		cam_sensor_iris_active: cam_sensor_iris_active {

			/* RESET  AVDD_LDO*/

			mux {

				pins = "gpio9", "gpio8";

				pins = "gpio9";

				function = "gpio";

			};



			config {

				pins = "gpio9", "gpio8";

				pins = "gpio9";

				bias-disable; /* No PULL */

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

			};
@@ -3074,12 +3074,12 @@ 
		cam_sensor_rear2_active: cam_sensor_rear2_active {

			/* RESET, STANDBY */

			mux {

				pins = "gpio9","gpio8";

				pins = "gpio9";

				function = "gpio";

			};



			config {

				pins = "gpio9","gpio8";

				pins = "gpio9";

				bias-disable; /* No PULL */

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

			};
@@ -3088,17 +3088,47 @@ 
		cam_sensor_rear2_suspend: cam_sensor_rear2_suspend {

			/* RESET, STANDBY */

			mux {

				pins = "gpio9","gpio8";

				pins = "gpio9";

				function = "gpio";

			};

			config {

				pins = "gpio9","gpio8";

				pins = "gpio9";

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

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

				output-low;

			};

		};



		cam_res_mgr_active: cam_res_mgr_active {

			/* AVDD_LDO*/

			mux {

				pins = "gpio8";

				function = "gpio";

			};



			config {

				pins = "gpio8";

				bias-disable; /* No PULL */

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

			};

		};



		cam_res_mgr_suspend: cam_res_mgr_suspend {

			/* AVDD_LDO */

			mux {

				pins = "gpio8";

				function = "gpio";

			};



			config {

				pins = "gpio8";

				bias-disable; /* No PULL */

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

				output-low;

			};

		};





		trigout_a: trigout_a {

			mux {

				pins = "gpio90";