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

Commit 874c14d8 authored by Abhijit Trivedi's avatar Abhijit Trivedi
Browse files

UPSTREAM: Merge remote-tracking branch 'quic/dev/msm-4.9-camx' into msm-4.9 - 10/04 



* quic/dev/msm-4.9-camx:
  msm: camera: isp: Add support for dual isp
  ARM: dts: msm: Fix the preview failure on sdm845v2
  msm: camera: fd: Check open_count before CDM streamoff
  msm: camera: cdm: Fix false negative in streamoff
  msm: camera: core: Add error log to identify node
  msm: camera: isp: Reuse existing release function
  msm: camera: Add csiphy memory dump support
  msm: camera: isp: Dynamic CSID IRQ Enable support
  msm: camera: Add check for I2C & SPI during IO release
  msm: camera: isp: Add support for PLAIN128 format over RDI
  ARM: dts: msm: add support for iris camera for SDM845 target
  clk: qcom: camcc-sdm845: Add the frequency table for csi3phytimer RCG
  msm: camera: Add skip for partial lit avoidance
  msm: camera: isp: Add error logging in ISP
  msm: camera: sensor: Use soc_info.index to replace subdev_id/id
  msm: camera: icp: Fix for Dynamic clock and bandwidth

Change-Id: I3da8d92548bd47d583c360e88ac4b8a701599d41
Signed-off-by: default avatarAbhijit Trivedi <abhijitt@codeaurora.org>
parents e13b7564 228c3c67

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

+43 −0
Original line number Diff line number Diff line
@@ -376,4 +376,47 @@ 
		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor@3 {

		cell-index = <3>;

		compatible = "qcom,cam-sensor";

		reg = <0x03>;

		csiphy-sd-index = <3>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <0>;

		cam_vio-supply = <&pm8998_lvs1>;

		cam_vana-supply = <&pmi8998_bob>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 3312000 1050000 0>;

		rgltr-max-voltage = <0 3600000 1050000 0>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk3_active

				 &cam_sensor_iris_active>;

		pinctrl-1 = <&cam_sensor_mclk3_suspend

				 &cam_sensor_iris_suspend>;

		gpios = <&tlmm 16 0>,

			<&tlmm 9 0>,

			<&tlmm 8 0>;

		gpio-reset = <1>;

		gpio-vana = <2>;

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

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

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

					"CAM_RESET3",

					"CAM_VANA1";

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK3_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};

};

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

+43 −0
Original line number Diff line number Diff line
@@ -376,4 +376,47 @@ 
		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};

	qcom,cam-sensor@3 {

		cell-index = <3>;

		compatible = "qcom,cam-sensor";

		reg = <0x03>;

		csiphy-sd-index = <3>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <0>;

		cam_vio-supply = <&pm8998_lvs1>;

		cam_vana-supply = <&pmi8998_bob>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 3312000 1050000 0>;

		rgltr-max-voltage = <0 3600000 1050000 0>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk3_active

				 &cam_sensor_iris_active>;

		pinctrl-1 = <&cam_sensor_mclk3_suspend

				 &cam_sensor_iris_suspend>;

		gpios = <&tlmm 16 0>,

			<&tlmm 9 0>,

			<&tlmm 8 0>;

		gpio-reset = <1>;

		gpio-vana = <2>;

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

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

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

					"CAM_RESET3",

					"CAM_VANA1";

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK3_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



};

arch/arm64/boot/dts/qcom/sdm845-camera.dtsi

+1 −3
Original line number Diff line number Diff line
@@ -817,7 +817,6 @@ 
			"soc_ahb_clk",

			"cpas_ahb_clk",

			"camnoc_axi_clk",

			"icp_apb_clk",

			"icp_clk",

			"icp_clk_src";

		clocks = <&clock_gcc GCC_CAMERA_AHB_CLK>,
@@ -826,11 +825,10 @@ 
				<&clock_camcc CAM_CC_SOC_AHB_CLK>,

				<&clock_camcc CAM_CC_CPAS_AHB_CLK>,

				<&clock_camcc CAM_CC_CAMNOC_AXI_CLK>,

				<&clock_camcc CAM_CC_ICP_APB_CLK>,

				<&clock_camcc CAM_CC_ICP_CLK>,

				<&clock_camcc CAM_CC_ICP_CLK_SRC>;



		clock-rates = <0 0 400000000 0 0 0 0 0 600000000>;

		clock-rates = <0 0 400000000 0 0 0 0 600000000>;

		clock-cntl-level = "turbo";

		fw_name = "CAMERA_ICP.elf";

		status = "ok";

arch/arm64/boot/dts/qcom/sdm845-interposer-pm660.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -183,6 +183,12 @@ 
		/delete-property/ cam_vio-supply;

		/delete-property/ cam_vana-supply;

	};



	qcom,cam-sensor@3 {

		/delete-property/ cam_vio-supply;

		/delete-property/ cam_vana-supply;

	};



};



&clock_gcc {

arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi

+59 −0
Original line number Diff line number Diff line
@@ -2826,6 +2826,35 @@ 
			};

		};



		cam_sensor_mclk3_active: cam_sensor_mclk3_active {

			/* MCLK3 */

			mux {

				pins = "gpio16";

				function = "cam_mclk";

			};



			config {

				pins = "gpio16";

				bias-disable; /* No PULL */

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

			};

		};



		cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend {

			/* MCLK3 */

			mux {

				pins = "gpio16";

				function = "cam_mclk";

			};



			config {

				pins = "gpio16";

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

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

			};

		};





		cam_sensor_front_active: cam_sensor_front_active {

			/* RESET  AVDD_LDO*/

			mux {
@@ -2855,6 +2884,36 @@ 
			};

		};



		cam_sensor_iris_active: cam_sensor_iris_active {

			/* RESET  AVDD_LDO*/

			mux {

				pins = "gpio9", "gpio8";

				function = "gpio";

			};



			config {

				pins = "gpio9", "gpio8";

				bias-disable; /* No PULL */

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

			};

		};



		cam_sensor_iris_suspend: cam_sensor_iris_suspend {

			/* RESET */

			mux {

				pins = "gpio9";

				function = "gpio";

			};



			config {

				pins = "gpio9";

				bias-disable; /* No PULL */

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

				output-low;

			};

		};





		cam_sensor_mclk2_active: cam_sensor_mclk2_active {

			/* MCLK1 */

			mux {