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

Commit 776d4104 authored by Sureshnaidu Laveti's avatar Sureshnaidu Laveti
Browse files

ARM: dts: msm: Add flash support for Kona camera sensors 



Add flash nodes for wide, tele, ultra wide sensors.

Change-Id: Ia739d73ce1e5654c38392062359b7a3e5d2c5d72
Signed-off-by: default avatarSureshnaidu Laveti <lsuresh@codeaurora.org>
parent fe38b6f0

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

+30 −2
Original line number Diff line number Diff line
@@ -22,6 +22,33 @@ 
		status = "ok";

	};



	led_flash_triple_rear: qcom,camera-flash@4 {

		cell-index = <4>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

	};



	led_flash_triple_rear_aux: qcom,camera-flash@5 {

		cell-index = <5>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

	};



	led_flash_triple_rear_aux2: qcom,camera-flash@6 {

		cell-index = <6>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

	};



	qcom,cam-res-mgr {

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

		status = "ok";
@@ -369,7 +396,7 @@ 
		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_triple_wide>;

		led-flash-src = <&led_flash_rear>;

		led-flash-src = <&led_flash_triple_rear>;

		eeprom-src = <&eeprom_triple_wide>;

		cam_vio-supply = <&pm8009_l7>;

		cam_bob-supply = <&pm8150a_bob>;
@@ -414,7 +441,7 @@ 
		sensor-position-yaw = <180>;

		eeprom-src = <&eeprom_triple_tele>;

		actuator-src = <&actuator_triple_tele>;

		led-flash-src = <&led_flash_rear_aux>;

		led-flash-src = <&led_flash_triple_rear_aux>;

		cam_bob-supply = <&pm8150a_bob>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_vio-supply = <&pm8009_l7>;
@@ -458,6 +485,7 @@ 
		sensor-position-yaw = <0>;

		eeprom-src = <&eeprom_triple_uw>;

		actuator-src = <&actuator_triple_uw>;

		led-flash-src = <&led_flash_triple_rear_aux2>;

		cam_vio-supply = <&pm8009_l7>;

		cam_bob-supply = <&pm8150a_bob>;

		cam_vana-supply = <&pm8009_l6>;

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

+30 −2
Original line number Diff line number Diff line
@@ -22,6 +22,33 @@ 
		status = "ok";

	};



	led_flash_triple_rear: qcom,camera-flash@4 {

		cell-index = <4>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

	};



	led_flash_triple_rear_aux: qcom,camera-flash@5 {

		cell-index = <5>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

	};



	led_flash_triple_rear_aux2: qcom,camera-flash@6 {

		cell-index = <6>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

	};



	qcom,cam-res-mgr {

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

		status = "ok";
@@ -370,7 +397,7 @@ 
		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_triple_wide>;

		led-flash-src = <&led_flash_rear>;

		led-flash-src = <&led_flash_triple_rear>;

		eeprom-src = <&eeprom_triple_wide>;

		cam_vio-supply = <&pm8009_l7>;

		cam_bob-supply = <&pm8150a_bob>;
@@ -415,7 +442,7 @@ 
		sensor-position-yaw = <180>;

		eeprom-src = <&eeprom_triple_tele>;

		actuator-src = <&actuator_triple_tele>;

		led-flash-src = <&led_flash_rear_aux>;

		led-flash-src = <&led_flash_triple_rear_aux>;

		cam_bob-supply = <&pm8150a_bob>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_vio-supply = <&pm8009_l7>;
@@ -459,6 +486,7 @@ 
		sensor-position-yaw = <0>;

		eeprom-src = <&eeprom_triple_uw>;

		actuator-src = <&actuator_triple_uw>;

		led-flash-src = <&led_flash_triple_rear_aux2>;

		cam_vio-supply = <&pm8009_l7>;

		cam_bob-supply = <&pm8150a_bob>;

		cam_vana-supply = <&pm8009_l6>;

arch/arm64/boot/dts/qcom/kona-camera-sensor-qrd.dtsi

+306 −0
Original line number Diff line number Diff line
@@ -22,6 +22,33 @@ 
		status = "ok";

	};



	led_flash_triple_rear: qcom,camera-flash@4 {

		cell-index = <4>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

	};



	led_flash_triple_rear_aux: qcom,camera-flash@5 {

		cell-index = <5>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

	};



	led_flash_triple_rear_aux2: qcom,camera-flash@6 {

		cell-index = <6>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

	};



	qcom,cam-res-mgr {

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

		status = "ok";
@@ -53,6 +80,42 @@ 
		rgltr-load-current = <100000>;

	};



	actuator_triple_wide: qcom,actuator4 {

		cell-index = <4>;

		compatible = "qcom,actuator";

		cci-master = <0>;

		cam_vaf-supply = <&pm8150a_l7>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2856000>;

		rgltr-max-voltage = <3104000>;

		rgltr-load-current = <100000>;

	};



	actuator_triple_tele: qcom,actuator5 {

		cell-index = <5>;

		compatible = "qcom,actuator";

		cci-master = <0>;

		cam_vaf-supply = <&pm8150a_l7>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2856000>;

		rgltr-max-voltage = <3104000>;

		rgltr-load-current = <100000>;

	};



	actuator_triple_uw: qcom,actuator6 {

		cell-index = <6>;

		compatible = "qcom,actuator";

		cci-master = <1>;

		cam_vaf-supply = <&pm8150a_l7>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2856000>;

		rgltr-max-voltage = <3104000>;

		rgltr-load-current = <100000>;

	};



	eeprom_rear: qcom,eeprom0 {

		cell-index = <0>;

		compatible = "qcom,eeprom";
@@ -127,6 +190,117 @@ 
		clock-rates = <24000000>;

	};



	eeprom_triple_wide: qcom,eeprom4 {

		cell-index = <4>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l1>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&pm8150a_l7>;

		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 2800000 1104000 0 2856000>;

		rgltr-max-voltage = <0 3000000 1104000 0 3104000>;

		rgltr-load-current = <0 80000 1200000 0 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-position = <0>;

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

	};



	eeprom_triple_tele: qcom,eeprom5 {

		cell-index = <1>;

		compatible = "qcom,eeprom";

		cam_vdig-supply = <&pm8009_l2>;

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l6>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&pm8150a_l7>;

		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 2800000 1200000 0 2856000>;

		rgltr-max-voltage = <0 3000000 1200000 0 3104000>;

		rgltr-load-current = <0 80000 1200000 0 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_MCLK1",

					"CAM_RESET1";

		sensor-position = <0>;

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

	};



	eeprom_triple_uw: qcom,eeprom6 {

		cell-index = <6>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l6>;

		cam_vdig-supply = <&pm8009_l3>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&pm8150a_l7>;

		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 2800000 1056000 0 2856000>;

		rgltr-max-voltage = <0 3000000 1056000 0 3104000>;

		rgltr-load-current = <0 80000 1200000 0 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-position = <1>;

		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-sensor0 {

		cell-index = <0>;

		compatible = "qcom,cam-sensor";
@@ -214,6 +388,138 @@ 
		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor4 {

		cell-index = <4>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <0>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_triple_wide>;

		led-flash-src = <&led_flash_triple_rear>;

		eeprom-src = <&eeprom_triple_wide>;

		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 = <0 2800000 1104000 0 3008000>;

		rgltr-max-voltage = <0 3000000 1104000 0 3960000>;

		rgltr-load-current = <0 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-sensor5 {

		cell-index = <5>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <1>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		eeprom-src = <&eeprom_triple_tele>;

		actuator-src = <&actuator_triple_tele>;

		led-flash-src = <&led_flash_triple_rear_aux>;

		cam_bob-supply = <&pm8150a_bob>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l6>;

		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 = <0 2800000 1200000 0 3008000>;

		rgltr-max-voltage = <0 3000000 1200000 0 3960000>;

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

		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_MCLK1",

					"CAM_RESET1";

		sensor-mode = <0>;

		cci-master = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK1_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor6 {

		cell-index = <6>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <2>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <0>;

		eeprom-src = <&eeprom_triple_uw>;

		actuator-src = <&actuator_triple_uw>;

		led-flash-src = <&led_flash_triple_rear_aux2>;

		cam_vio-supply = <&pm8009_l7>;

		cam_bob-supply = <&pm8150a_bob>;

		cam_vana-supply = <&pm8009_l6>;

		cam_vdig-supply = <&pm8009_l3>;

		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 = <0 2800000 1056000 0 3008000>;

		rgltr-max-voltage = <0 3000000 1056000 0 3960000>;

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

		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 = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};

};



&cam_cci1 {