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

Commit 1dc876c1 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/11 



with backward compatibility fix

* commit '9e8954ae':
  msm: camera: jpeg: Add backward compatibility for cdm fix
  msm: camera: sensor: clean up the pending request at stop
  ARM: dts: msm: Correct regulator sources for sdm845
  msm: camera: Fix regulator disable sequence
  msm: camera: Fix crash in EEPROM reading
  msm: camera: Update log level for better visibility
  msm: camera: sensor: seperating sensor configuration commands
  msm: camera: fd: Need to use irqsave for spin_lock
  msm: camera: isp: Protect the evt_handler with lock
  msm: camera: jpeg: fix cdm command from jpeg driver
  msm: camera: cpas: Add QoS settings for ICP
  msm: camera: fd: Disable clk gating before halt-reset sequence
  msm: camera: isp: Add check for CSIPHY3 in CSID
  msm: camera: isp: Add support for VFE Bus Lite version 170
  msm: camera: icp: Disable A5 clk gating
  msm: camera: jpeg: make some data types common to enc and dma
  msm: camera: jpeg: move reg offsets to specific header
  msm: camera: jpeg: Protect ref_cnt underrun and other error
  msm: camera : Fix for OIS and actuator power up issue
  ARM: dts: msm: Correct power source for csiphy for SDM845 target

Change-Id: I5d5a22ce9642148e38ad6ec5e733aad6ae71b9bd
Signed-off-by: default avatarAbhijit Trivedi <abhijitt@codeaurora.org>
parents 9c9a0530 9e8954ae

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

+13 −7
Original line number Diff line number Diff line
@@ -122,8 +122,9 @@ 
		cam_vana-supply = <&pmi8998_bob>;

		cam_vdig-supply = <&camera_rear_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&actuator_regulator>;

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

			"cam_clk";

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

		rgltr-max-voltage = <0 3600000 1050000 0>;
@@ -165,8 +166,9 @@ 
		cam_vio-supply = <&pm8998_lvs1>;

		cam_vana-supply = <&pmi8998_bob>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&actuator_regulator>;

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

			"cam_clk";

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

		rgltr-max-voltage = <1050000 0 3600000 0>;
@@ -179,14 +181,17 @@ 
				 &cam_sensor_rear2_suspend>;

		gpios = <&tlmm 15 0>,

			<&tlmm 9 0>,

			<&tlmm 8 0>;

			<&tlmm 8 0>,

			<&tlmm 27 0>;

		gpio-reset = <1>;

		gpio-vana = <2>;

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

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

		gpio-vaf = <3>;

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

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

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

					"CAM_RESET1",

					"CAM_VANA1";

					"CAM_VANA1",

					"CAM_VAF";

		sensor-position = <0>;

		sensor-mode = <0>;

		cci-master = <1>;
@@ -205,8 +210,9 @@ 
		cam_vana-supply = <&pmi8998_bob>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&actuator_regulator>;

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

			"cam_clk";

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

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

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

+13 −7
Original line number Diff line number Diff line
@@ -122,8 +122,9 @@ 
		cam_vana-supply = <&pmi8998_bob>;

		cam_vdig-supply = <&camera_rear_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&actuator_regulator>;

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

			"cam_clk";

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

		rgltr-max-voltage = <0 3600000 1050000 0>;
@@ -165,8 +166,9 @@ 
		cam_vio-supply = <&pm8998_lvs1>;

		cam_vana-supply = <&pmi8998_bob>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&actuator_regulator>;

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

			"cam_clk";

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

		rgltr-max-voltage = <1050000 0 3600000 0>;
@@ -179,14 +181,17 @@ 
				 &cam_sensor_rear2_suspend>;

		gpios = <&tlmm 15 0>,

			<&tlmm 9 0>,

			<&tlmm 8 0>;

			<&tlmm 8 0>,

			<&tlmm 27 0>;

		gpio-reset = <1>;

		gpio-vana = <2>;

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

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

		gpio-vaf = <3>;

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

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

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

					"CAM_RESET1",

					"CAM_VANA1";

					"CAM_VANA1",

					"CAM_VAF";

		sensor-position = <0>;

		sensor-mode = <0>;

		cci-master = <1>;
@@ -205,8 +210,9 @@ 
		cam_vana-supply = <&pmi8998_bob>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&actuator_regulator>;

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

			"cam_clk";

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

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

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

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
		gdscr-supply = <&titan_top_gdsc>;

		regulator-names = "gdscr";

		csi-vdd-voltage = <1200000>;

		mipi-csi-vdd-supply = <&pm8998_l26>;

		mipi-csi-vdd-supply = <&pm8998_l1>;

		clocks = <&clock_camcc CAM_CC_CAMNOC_AXI_CLK>,

			<&clock_camcc CAM_CC_SOC_AHB_CLK>,

			<&clock_camcc CAM_CC_SLOW_AHB_CLK_SRC>,
@@ -62,7 +62,7 @@ 
		gdscr-supply = <&titan_top_gdsc>;

		regulator-names = "gdscr";

		csi-vdd-voltage = <1200000>;

		mipi-csi-vdd-supply = <&pm8998_l26>;

		mipi-csi-vdd-supply = <&pm8998_l1>;

		clocks = <&clock_camcc CAM_CC_CAMNOC_AXI_CLK>,

			<&clock_camcc CAM_CC_SOC_AHB_CLK>,

			<&clock_camcc CAM_CC_SLOW_AHB_CLK_SRC>,
@@ -97,7 +97,7 @@ 
		gdscr-supply = <&titan_top_gdsc>;

		regulator-names = "gdscr";

		csi-vdd-voltage = <1200000>;

		mipi-csi-vdd-supply = <&pm8998_l26>;

		mipi-csi-vdd-supply = <&pm8998_l1>;

		clocks = <&clock_camcc CAM_CC_CAMNOC_AXI_CLK>,

			<&clock_camcc CAM_CC_SOC_AHB_CLK>,

			<&clock_camcc CAM_CC_SLOW_AHB_CLK_SRC>,

drivers/media/platform/msm/camera/cam_cpas/cpas_top/cam_cpastop_hw.c

+2 −0
Original line number Diff line number Diff line
@@ -372,6 +372,8 @@ static int cam_cpastop_poweron(struct cam_hw_info *cpas_hw) 
				&camnoc_info->specific[i].safe_lut);

			cam_cpas_util_reg_update(cpas_hw, CAM_CPAS_REG_CAMNOC,

				&camnoc_info->specific[i].ubwc_ctl);

			cam_cpas_util_reg_update(cpas_hw, CAM_CPAS_REG_CAMNOC,

				&camnoc_info->specific[i].flag_out_set0_low);

		}

	}

drivers/media/platform/msm/camera/cam_cpas/cpas_top/cam_cpastop_hw.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ struct cam_camnoc_specific { 
	struct cam_cpas_reg danger_lut;

	struct cam_cpas_reg safe_lut;

	struct cam_cpas_reg ubwc_ctl;

	struct cam_cpas_reg flag_out_set0_low;

};



/**