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

Commit 26f8097b authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge a871bf2d on remote branch 

Change-Id: If516b228e69b99228a18bf16b3b30af663837a16
parents 792910a4 a871bf2d

kona-camera-sensor-rb5.dtsi

0 → 100644
+278 −0
Original line number Diff line number Diff line 
&soc {

	qcom,cam-res-mgr {

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

		status = "ok";

	};

};



&tlmm {

	cam_sensor_active_gmsl: cam_sensor_active_gmsl {

		/* RESET */

		mux {

			pins = "gpio99";

			function = "gpio";

		};



		config {

			pins = "gpio99";

			bias-pull-up;

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

			output-high;

		};

	};



	cam_sensor_suspend_gmsl: cam_sensor_suspend_gmsl {

		/* RESET */

		mux {

			pins = "gpio99";

			function = "gpio";

		};



		config {

			pins = "gpio99";

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

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

			output-low;

		};

	};

};



&cam_cci0 {

	qcom,cam-sensor0 {

		cell-index = <0>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <0>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		cam_vio-supply = <&pm8009_l7>;

		cam_clk-supply = <&titan_top_gdsc>;

		regulator-names = "cam_vio", "cam_clk";

		rgltr-cntrl-support;

		pwm-switch;

		rgltr-min-voltage = <1800000 0>;

		rgltr-max-voltage = <1800000 0>;

		rgltr-load-current = <120000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active

				&cam_sensor_active_rear>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend

				&cam_sensor_suspend_rear>;

		gpios = <&tlmm 94 0>,

			<&tlmm 93 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET0";

		sensor-mode = <0>;

		cci-master = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor1 {

		cell-index = <1>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <1>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		cam_vio-supply = <&pm8009_l7>;

		cam_clk-supply = <&titan_top_gdsc>;

		regulator-names = "cam_vio", "cam_clk";

		rgltr-cntrl-support;

		pwm-switch;

		rgltr-min-voltage = <1800000 0>;

		rgltr-max-voltage = <1800000 0>;

		rgltr-load-current = <120000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active

				&cam_sensor_active_rear_aux>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				&cam_sensor_suspend_rear_aux>;

		gpios = <&tlmm 95 0>,

			<&tlmm 92 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET0";

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK1_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor3 {

		cell-index = <3>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <0>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		cam_vio-supply = <&pm8009_l7>;

		cam_bob-supply = <&pm8150a_bob>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l1>;

		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-load-current = <120000 80000 1200000 0 2000000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active

				&cam_sensor_active_rear>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend

				&cam_sensor_suspend_rear>;

		gpios = <&tlmm 94 0>,

			<&tlmm 93 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET0";

		sensor-mode = <0>;

		cci-master = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor4 {

		cell-index = <4>;

		status = "disable";

	};



	qcom,cam-sensor5 {

		cell-index = <5>;

		status = "disable";

	};

};



&cam_cci1 {

	qcom,cam-sensor2 {

		cell-index = <2>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <2>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <0>;

		cam_vio-supply = <&pm8009_l7>;

		cam_clk-supply = <&titan_top_gdsc>;

		regulator-names = "cam_vio", "cam_clk";

		rgltr-cntrl-support;

		pwm-switch;

		rgltr-min-voltage = <1800000 0>;

		rgltr-max-voltage = <1800000 0>;

		rgltr-load-current = <120000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active

				 &cam_sensor_active_rst2>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				 &cam_sensor_suspend_rst2>;

		gpios = <&tlmm 96 0>,

			<&tlmm 78 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET2";

		sensor-mode = <0>;

		cci-master = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor4 {

		cell-index = <4>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <4>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <0>;

		cam_vio-supply = <&pm8009_l7>;

		cam_clk-supply = <&titan_top_gdsc>;

		regulator-names = "cam_vio", "cam_clk";

		rgltr-cntrl-support;

		pwm-switch;

		rgltr-min-voltage = <1800000 0>;

		rgltr-max-voltage = <1800000 0>;

		rgltr-load-current = <120000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active

				 &cam_sensor_active_gmsl>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				 &cam_sensor_suspend_gmsl>;

		gpios = <&tlmm 94 0>,

			<&tlmm 99 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET4";

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor5 {

		cell-index = <5>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <4>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <0>;

		cam_vio-supply = <&pm8009_l7>;

		cam_clk-supply = <&titan_top_gdsc>;

		regulator-names = "cam_vio", "cam_clk";

		rgltr-cntrl-support;

		pwm-switch;

		rgltr-min-voltage = <1800000 0>;

		rgltr-max-voltage = <1800000 0>;

		rgltr-load-current = <120000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active

				 &cam_sensor_active_gmsl>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				 &cam_sensor_suspend_gmsl>;

		gpios = <&tlmm 94 0>,

			<&tlmm 99 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET4";

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};

};

kona-camera-sensor-xr.dtsi

+27 −7
Original line number Diff line number Diff line 
#include <dt-bindings/clock/qcom,camcc-kona.h>



&soc {

	led_flash_rear: qcom,camera-flash0 {

	led_flash_rear: qcom,camera-flash@0 {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

		status = "disabled";

	};



	led_flash_rear_aux: qcom,camera-flash1 {

	led_flash_rear_aux: qcom,camera-flash@1 {

		cell-index = <1>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "disabled";

	};



	led_flash_eye_track: qcom,camera-flash@2 {

		cell-index = <2>;

		compatible = "qcom,camera-flash";

		gpios = <&tlmm 22 0>,

				<&tlmm 23 0>,

				<&tlmm 24 0>;

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

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

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

							"TCKING_LED_3V3_EN",

							"TCKING_LED_EN";

		gpio-req-tbl-delay = <20 20 20>;

		status = "ok";

	};
@@ -25,7 +40,7 @@ 
		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

		status = "disabled";

	};



	led_flash_triple_rear_aux: qcom,camera-flash@5 {
@@ -34,7 +49,7 @@ 
		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

		status = "disabled";

	};



	led_flash_triple_rear_aux2: qcom,camera-flash@6 {
@@ -43,7 +58,7 @@ 
		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

		status = "disabled";

	};



	qcom,cam-res-mgr {
@@ -266,6 +281,7 @@ 
		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	/* RGB Left (Master) */

	qcom,cam-sensor2 {

		cell-index = <2>;
@@ -317,6 +333,7 @@ 
		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	/* RGB Right (Slave) */

	qcom,cam-sensor3 {

		cell-index = <3>;
@@ -367,6 +384,7 @@ 
		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	/* 6DOF Left (Slave) */

	qcom,cam-sensor4 {

		cell-index = <4>;
@@ -417,6 +435,7 @@ 
		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	/* 6DOF Right (Master) */

	qcom,cam-sensor5 {

		cell-index = <5>;
@@ -649,6 +668,7 @@ 
		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_eye_track>;

		cam_vio-supply = <&pm8009_l7>;

		cam_bob-supply = <&pm8150a_bob>;

		cam_vana-supply = <&pm8009_l6>;

kona-camera-sensor-xrfusion.dtsi

+27 −12
Original line number Diff line number Diff line 
#include <dt-bindings/clock/qcom,camcc-kona.h>



&soc {

	led_flash_rear: qcom,camera-flash0 {

	led_flash_rear: qcom,camera-flash@0 {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;
@@ -10,7 +10,7 @@ 
		status = "disabled";

	};



	led_flash_rear_aux: qcom,camera-flash1 {

	led_flash_rear_aux: qcom,camera-flash@1 {

		cell-index = <1>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;
@@ -19,6 +19,21 @@ 
		status = "disabled";

	};



	led_flash_eye_track: qcom,camera-flash@2 {

		cell-index = <2>;

		compatible = "qcom,camera-flash";

		gpios = <&tlmm 22 0>,

				<&tlmm 23 0>,

				<&tlmm 24 0>;

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

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

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

							"TCKING_LED_3V3_EN",

							"TCKING_LED_EN";

		gpio-req-tbl-delay = <20 20 20>;

		status = "ok";

	};



	led_flash_triple_rear: qcom,camera-flash@4 {

		cell-index = <4>;

		compatible = "qcom,camera-flash";
@@ -59,7 +74,6 @@ 
				&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
@@ -373,7 +387,7 @@ 


	/* 6DOF Left (Slave) */

	qcom,cam-sensor4 {

		cell-index = <4>;

		cell-index = <0>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <4>;

		sensor-position-roll = <90>;
@@ -422,9 +436,9 @@ 
		clock-rates = <24000000>;

	};



	/* 6DOF Left (Master) */

	/* 6DOF Right (Master) */

	qcom,cam-sensor5 {

		cell-index = <5>;

		cell-index = <1>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <5>;

		sensor-position-roll = <90>;
@@ -596,9 +610,9 @@ 
		clock-rates = <24000000>;

	};



	/* ET LEFT (Master) */

	/* ET Left (Master): Combo Mode */

	qcom,cam-sensor0 {

		cell-index = <0>;

		cell-index = <4>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <0>;

		sensor-position-roll = <90>;
@@ -644,18 +658,19 @@ 
		clock-rates = <24000000>;

	};



	/* ET RIGHT (Slave) Combo mode */

	/* ET Right (Slave): Combo Mode */

	qcom,cam-sensor1 {

		cell-index = <1>;

		cell-index = <5>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <0>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		cam_bob-supply = <&pm8150a_bob>;

		cam_vdig-supply = <&pm8009_l2>;

		led-flash-src = <&led_flash_eye_track>;

		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";

lagoon-camera.dtsi

+5 −4
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
		mipi-csi-vdd2-supply = <&L22A>;

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 0 880000 1200000>;

		rgltr-max-voltage = <0 0 880000 1200000>;

		rgltr-max-voltage = <0 0 1049000 1305000>;

		rgltr-load-current = <0 0 80000 80000>;

		clocks = <&camcc CAM_CC_CPHY_RX_CLK_SRC>,

			<&camcc CAM_CC_CSIPHY0_CLK>,
@@ -57,7 +57,7 @@ 
		mipi-csi-vdd2-supply = <&L22A>;

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 0 880000 1200000>;

		rgltr-max-voltage = <0 0 880000 1200000>;

		rgltr-max-voltage = <0 0 1049000 1305000>;

		rgltr-load-current = <0 0 80000 80000>;

		clocks = <&camcc CAM_CC_CPHY_RX_CLK_SRC>,

			<&camcc CAM_CC_CSIPHY1_CLK>,
@@ -92,7 +92,7 @@ 
		mipi-csi-vdd2-supply = <&L22A>;

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 0 880000 1200000>;

		rgltr-max-voltage = <0 0 880000 1200000>;

		rgltr-max-voltage = <0 0 1049000 1305000>;

		rgltr-load-current = <0 0 80000 80000>;

		clocks = <&camcc CAM_CC_CPHY_RX_CLK_SRC>,

			<&camcc CAM_CC_CSIPHY2_CLK>,
@@ -127,7 +127,7 @@ 
		mipi-csi-vdd2-supply = <&L22A>;

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 0 880000 1200000>;

		rgltr-max-voltage = <0 0 880000 1200000>;

		rgltr-max-voltage = <0 0 1049000 1305000>;

		rgltr-load-current = <0 0 80000 80000>;

		clocks = <&camcc CAM_CC_CPHY_RX_CLK_SRC>,

			<&camcc CAM_CC_CSIPHY3_CLK>,
@@ -740,6 +740,7 @@ 
		clock-names-option =  "ife_dsp_clk";

		clocks-option = <&camcc CAM_CC_IFE_2_DSP_CLK>;

		clock-rates-option = <600000000>;

		dsp-disabled;

		status = "ok";

	};