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

Commit 351bd89e authored by Abhijit Trivedi's avatar Abhijit Trivedi
Browse files

UPSTREAM: Merge PC57.5 commit '9d1406e9' into msm-4.9 - 12/11/17 



* commit '9d1406e9':
  msm: camera: Add support for active deactive feature
  msm: camera: sensor: Remove unrelevant power down sequence
  msm: camera: Change Log level for cci irq
  msm: camera: icp: Fix calculation of acquire size
  msm: camera: isp: Lock around every list access
  msm: camera: sync: Validate state of sync object in sync signal
  msm: camera: reqmgr: Adds total ordering of reqs for all pd devices
  msm: camera: icp: Add Power Collapse
  msm: camera: Apply power settings from userspace
  msm: camera: util: Remove logk from read and write
  msm: camera: icp: Populate the right size for pkts sent by FW
  msm: camera: crm: Use del_timer_sync to delete the timer
  msm: camera: Call secure camera during stream on
  msm: camera: Add external cfg command opcode and csiphy cfg
  ARM: dts: msm: ICP clock failure fix for sdm670
  msm: camera: isp: resolve csid stop race condition
  msm: camera: crm: Add mutex lock to avoid race condition
  ARM: dts: msm: update camera node for sdm670 qrd devices
  msm: camera: isp: Cleanup the hw manager Context variables during release
  msm: camera: Fix incorrect update in EEPROM packet parser
  msm: camera: cpas: Configure Qos settings
  ARM: dts: msm: Add shared gpio for front/iris camera on SDM845
  msm: camera: reqmgr: Add reserved field to align UAPI

Change-Id: If275550a7025cd029fa2bb118d769e56aa532326
Signed-off-by: default avatarAbhijit Trivedi <abhijitt@codeaurora.org>
parents b14f1bf3 9d1406e9

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

+26 −23
Original line number Diff line number Diff line
@@ -229,12 +229,13 @@ 
		cam_vana-supply = <&cam_rear_avdd_gpio_regulator>;

		cam_vdig-supply = <&cam_rear_dvdd_gpio_regulator>;

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

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

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

		rgltr-min-voltage = <1800000 2850000 1200000 0 2800000>;

		rgltr-max-voltage = <1800000 2850000 1200000 0 2800000>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -266,12 +267,13 @@ 
		cam_vana-supply = <&cam_avdd_gpio_regulator>;

		cam_vdig-supply = <&cam_dvdd_gpio_regulator>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		cam_vaf-supply = <&actuator_regulator>;

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

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

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

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

		rgltr-min-voltage = <1200000 1800000 2850000 0 2800000>;

		rgltr-max-voltage = <1200000 1800000 2850000 0 2800000>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -303,12 +305,13 @@ 
		cam_vana-supply = <&cam_avdd_gpio_regulator>;

		cam_vdig-supply = <&cam_dvdd_gpio_regulator>;

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

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

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

		rgltr-min-voltage = <1800000 2850000 1200000 0 2800000>;

		rgltr-max-voltage = <1800000 2850000 1200000 0 2800000>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active
@@ -350,9 +353,9 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk";

		rgltr-cntrl-support;

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

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

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

		rgltr-min-voltage = <1800000 2850000 1200000 0>;

		rgltr-max-voltage = <1800000 2850000 1200000 0>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -390,12 +393,12 @@ 
		cam_vana-supply = <&cam_avdd_gpio_regulator>;

		cam_vdig-supply = <&cam_dvdd_gpio_regulator>;

		cam_clk-supply = <&titan_top_gdsc>;

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

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

			"cam_clk";

		rgltr-cntrl-support;

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

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

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

		rgltr-min-voltage = <1200000 1800000 2850000 0>;

		rgltr-max-voltage = <1200000 1800000 2850000 0>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -435,9 +438,9 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk";

		rgltr-cntrl-support;

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

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

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

		rgltr-min-voltage = <1800000 2850000 1200000 0>;

		rgltr-max-voltage = <1800000 2850000 1200000 0>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active

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

+4 −0
Original line number Diff line number Diff line
@@ -97,6 +97,10 @@ 
	qcom,cam-res-mgr {

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

		status = "ok";

		shared-gpios = <8>;

		pinctrl-names = "cam_res_mgr_default", "cam_res_mgr_suspend";

		pinctrl-0 = <&cam_res_mgr_active>;

		pinctrl-1 = <&cam_res_mgr_suspend>;

	};



	actuator_rear: qcom,actuator@0 {

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

+4 −0
Original line number Diff line number Diff line
@@ -97,6 +97,10 @@ 
	qcom,cam-res-mgr {

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

		status = "ok";

		shared-gpios = <8>;

		pinctrl-names = "cam_res_mgr_default", "cam_res_mgr_suspend";

		pinctrl-0 = <&cam_res_mgr_active>;

		pinctrl-1 = <&cam_res_mgr_suspend>;

	};



	actuator_rear: qcom,actuator@0 {

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

+38 −8
Original line number Diff line number Diff line
@@ -2985,12 +2985,12 @@ 
		cam_sensor_front_active: cam_sensor_front_active {

			/* RESET  AVDD_LDO*/

			mux {

				pins = "gpio28", "gpio8";

				pins = "gpio28";

				function = "gpio";

			};



			config {

				pins = "gpio28", "gpio8";

				pins = "gpio28";

				bias-disable; /* No PULL */

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

			};
@@ -3014,12 +3014,12 @@ 
		cam_sensor_iris_active: cam_sensor_iris_active {

			/* RESET  AVDD_LDO*/

			mux {

				pins = "gpio9", "gpio8";

				pins = "gpio9";

				function = "gpio";

			};



			config {

				pins = "gpio9", "gpio8";

				pins = "gpio9";

				bias-disable; /* No PULL */

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

			};
@@ -3074,12 +3074,12 @@ 
		cam_sensor_rear2_active: cam_sensor_rear2_active {

			/* RESET, STANDBY */

			mux {

				pins = "gpio9","gpio8";

				pins = "gpio9";

				function = "gpio";

			};



			config {

				pins = "gpio9","gpio8";

				pins = "gpio9";

				bias-disable; /* No PULL */

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

			};
@@ -3088,17 +3088,47 @@ 
		cam_sensor_rear2_suspend: cam_sensor_rear2_suspend {

			/* RESET, STANDBY */

			mux {

				pins = "gpio9","gpio8";

				pins = "gpio9";

				function = "gpio";

			};

			config {

				pins = "gpio9","gpio8";

				pins = "gpio9";

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

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

				output-low;

			};

		};



		cam_res_mgr_active: cam_res_mgr_active {

			/* AVDD_LDO*/

			mux {

				pins = "gpio8";

				function = "gpio";

			};



			config {

				pins = "gpio8";

				bias-disable; /* No PULL */

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

			};

		};



		cam_res_mgr_suspend: cam_res_mgr_suspend {

			/* AVDD_LDO */

			mux {

				pins = "gpio8";

				function = "gpio";

			};



			config {

				pins = "gpio8";

				bias-disable; /* No PULL */

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

				output-low;

			};

		};





		trigout_a: trigout_a {

			mux {

				pins = "gpio90";

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

+5 −5
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static struct cam_camnoc_specific 
			.offset = 0x38, /* SPECIFIC_CDM_URGENCY_LOW */

			.mask = 0x7, /* SPECIFIC_CDM_URGENCY_LOW_READ_MASK */

			.shift = 0x0, /* SPECIFIC_CDM_URGENCY_LOW_READ_SHIFT */

			.value = 0,

			.value = 0x2,

		},

		.danger_lut = {

			.enable = false,
@@ -258,7 +258,7 @@ static struct cam_camnoc_specific 
			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x430, /* SPECIFIC_IFE02_PRIORITYLUT_LOW */

			.value = 0x44443333,

			.value = 0x66666543,

		},

		.priority_lut_high = {

			.enable = true,
@@ -288,7 +288,7 @@ static struct cam_camnoc_specific 
			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.offset = 0x448, /* SPECIFIC_IFE02_SAFELUT_LOW */

			.value = 0x3,

			.value = 0x1,

		},

		.ubwc_ctl = {

			.enable = true,
@@ -306,7 +306,7 @@ static struct cam_camnoc_specific 
			.access_type = CAM_REG_TYPE_READ_WRITE,

			.masked_value = 0,

			.offset = 0x830, /* SPECIFIC_IFE13_PRIORITYLUT_LOW */

			.value = 0x44443333,

			.value = 0x66666543,

		},

		.priority_lut_high = {

			.enable = true,
@@ -336,7 +336,7 @@ static struct cam_camnoc_specific 
			.enable = true,

			.access_type = CAM_REG_TYPE_READ_WRITE,

			.offset = 0x848, /* SPECIFIC_IFE13_SAFELUT_LOW */

			.value = 0x3,

			.value = 0x1,

		},

		.ubwc_ctl = {

			.enable = true,