Merge "ARM: dts: msm: Fix shared GPIOs for Kona XR platform" into camera-kernel.lnx.1.0 (c0cf198e) · Commits · e / devices / android_kernel_fairphone_FP4

kona-camera-sensor-xr.dtsi

+19 −13

Original line number	Diff line number	Diff line
		@@ -49,18 +49,24 @@
		qcom,cam-res-mgr {
		compatible = "qcom,cam-res-mgr";
		status = "ok";
		shared-gpios = <84 83 82 114 145>;
		shared-gpios = <1184 1183 1182 1214 1245 1217 1216 1215>;
		pinctrl-names = "cam_res_mgr_default", "cam_res_mgr_suspend";
		pinctrl-0 = <&cam_sensor_6dof_vana_active
		&cam_sensor_6dof_vdig_active
		&cam_sensor_6dof_vio_active
		&cam_sensor_active_6
		&cam_sensor_et_vio_active>;
		&cam_sensor_et_vana_active
		&cam_sensor_et_vio_active
		&cam_sensor_rgb_vana_active
		&cam_sensor_rgb_vio_active
		&cam_sensor_rgb_vdig_active>;
		pinctrl-1 = <&cam_sensor_6dof_vana_suspend
		&cam_sensor_6dof_vdig_suspend
		&cam_sensor_6dof_vio_suspend
		&cam_sensor_suspend_6
		&cam_sensor_et_vio_suspend>;
		&cam_sensor_et_vana_suspend
		&cam_sensor_et_vio_suspend
		&cam_sensor_rgb_vana_suspend
		&cam_sensor_rgb_vio_suspend
		&cam_sensor_rgb_vdig_suspend>;
		};
		};

		@@ -587,7 +593,7 @@
		clock-rates = <24000000>;
		};

		/* ET LEFT (Master) */
		/* ET Left (Master) */
		qcom,cam-sensor0 {
		cell-index = <0>;
		compatible = "qcom,cam-sensor";
		@@ -598,14 +604,14 @@
		cam_vio-supply = <&pm8009_l7>;
		cam_bob-supply = <&pm8150a_bob>;
		cam_vana-supply = <&pm8009_l6>;
		cam_vdig-supply = <&pm8009_l1>;
		cam_vdig-supply = <&pm8009_l2>;
		cam_clk-supply = <&titan_top_gdsc>;
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",
		"cam_clk", "cam_bob";
		rgltr-cntrl-support;
		pwm-switch;
		rgltr-min-voltage = <1800000 2800000 1104000 0 3008000>;
		rgltr-max-voltage = <1800000 3000000 1104000 0 3960000>;
		rgltr-min-voltage = <1800000 2800000 1200000 0 3008000>;
		rgltr-max-voltage = <1800000 3000000 1200000 0 3960000>;
		rgltr-load-current = <600000 80000 1200000 0 2000000>;
		gpio-no-mux = <0>;
		pinctrl-names = "cam_default", "cam_suspend";
		@@ -635,7 +641,7 @@
		clock-rates = <24000000>;
		};

		/* ET RIGHT (Left) */
		/* ET Right (Slave) */
		qcom,cam-sensor1 {
		cell-index = <1>;
		compatible = "qcom,cam-sensor";
		@@ -643,10 +649,10 @@
		sensor-position-roll = <90>;
		sensor-position-pitch = <0>;
		sensor-position-yaw = <180>;
		cam_bob-supply = <&pm8150a_bob>;
		cam_vdig-supply = <&pm8009_l2>;
		cam_vio-supply = <&pm8009_l7>;
		cam_bob-supply = <&pm8150a_bob>;
		cam_vana-supply = <&pm8009_l6>;
		cam_vdig-supply = <&pm8009_l2>;
		cam_clk-supply = <&titan_top_gdsc>;
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",
		"cam_clk", "cam_bob";