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

Commit 8a088548 authored by Jigarkumar Zala's avatar Jigarkumar Zala
Browse files

ARM: dts: msm: Move camera sensor nodes under correct CCI for Kona target 

In order to get sensor work for multicamera usecase on CDP target, sensor
and it's submodules needs to be under correct CCI. This change moves
sensor nodes and it's respective submodules under correct CCI.

CRs-Fixed: 2630418
Change-Id: I60176ea97dd372fc5c706aa4abdd1cd1aed39886
parent 4ac996f3

kona-camera-sensor-cdp.dtsi

+92 −92
Original line number Diff line number Diff line
@@ -92,18 +92,6 @@ 
	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";
@@ -253,43 +241,6 @@ 
					"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 = <1800000 2800000 1056000 0 2856000>;

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

		rgltr-load-current = <120000 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>;
@@ -465,60 +416,28 @@ 
		gpio-req-tbl-label = "CAMIF_MCLK1",

					"CAM_RESET1";

		sensor-mode = <0>;

		cci-master = <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-sensor6 {

&cam_cci1 {

	actuator_triple_uw: qcom,actuator6 {

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

		compatible = "qcom,actuator";

		cci-master = <0>;

		cam_vaf-supply = <&pm8150a_l7>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		pwm-switch;

		rgltr-min-voltage = <1800000 2800000 1056000 0 3008000>;

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

		rgltr-load-current = <120000 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>;

	};

		rgltr-min-voltage = <2856000>;

		rgltr-max-voltage = <3104000>;

		rgltr-load-current = <100000>;

	};



&cam_cci1 {

	eeprom_front: qcom,eeprom2 {

		cell-index = <2>;

		compatible = "qcom,eeprom";
@@ -591,6 +510,43 @@ 
		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 = <1800000 2800000 1056000 0 2856000>;

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

		rgltr-load-current = <120000 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 = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor2 {

		cell-index = <2>;

		compatible = "qcom,cam-sensor";
@@ -671,4 +627,48 @@ 
		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 = <1800000 2800000 1056000 0 3008000>;

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

		rgltr-load-current = <120000 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 = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};

};