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

Commit ef5800bd authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add support for cci1 in camera for kona platforms"

parents cd79a94b 27aeccac

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

+43 −40
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ 
		switch-source = <&pm8150l_switch2>;

		status = "ok";

	};

};



&cam_cci0 {

	qcom,cam-res-mgr {

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

		status = "ok";

	};

};



&cam_cci0 {

	actuator_rear: qcom,actuator0 {

		cell-index = <0>;

		compatible = "qcom,actuator";
@@ -115,43 +115,6 @@ 
		clock-rates = <24000000>;

	};



	eeprom_front: qcom,eeprom2 {

		cell-index = <2>;

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

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				 &cam_sensor_suspend_front>;

		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";
@@ -236,6 +199,45 @@ 
		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};

};



&cam_cci1 {

	eeprom_front: qcom,eeprom2 {

		cell-index = <2>;

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

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				 &cam_sensor_suspend_front>;

		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>;
@@ -271,7 +273,7 @@ 
		gpio-req-tbl-label = "CAMIF_MCLK2",

					"CAM_RESET2";

		sensor-mode = <0>;

		cci-master = <1>;

		cci-master = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;

		clock-names = "cam_clk";
@@ -279,3 +281,4 @@ 
		clock-rates = <24000000>;

	};

};

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

+43 −40
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ 
		switch-source = <&pm8150l_switch2>;

		status = "ok";

	};

};



&cam_cci0 {

	qcom,cam-res-mgr {

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

		status = "ok";

	};

};



&cam_cci0 {

	actuator_rear: qcom,actuator0 {

		cell-index = <0>;

		compatible = "qcom,actuator";
@@ -115,43 +115,6 @@ 
		clock-rates = <24000000>;

	};



	eeprom_front: qcom,eeprom2 {

		cell-index = <2>;

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

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				 &cam_sensor_suspend_front>;

		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";
@@ -236,6 +199,45 @@ 
		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};

};



&cam_cci1 {

	eeprom_front: qcom,eeprom2 {

		cell-index = <2>;

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

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				 &cam_sensor_suspend_front>;

		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>;
@@ -271,7 +273,7 @@ 
		gpio-req-tbl-label = "CAMIF_MCLK2",

					"CAM_RESET2";

		sensor-mode = <0>;

		cci-master = <1>;

		cci-master = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;

		clock-names = "cam_clk";
@@ -279,3 +281,4 @@ 
		clock-rates = <24000000>;

	};

};