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

Commit 2a77e11d authored by Abhijit Trivedi's avatar Abhijit Trivedi
Browse files

UPSTREAM: Merge commit 'e0502b1d' into mainline - PC194 -0629 



* commit 'e0502b1d':
  msm: camera: isp: Fix overwriting UBWC config register
  msm: camera: Correct check for rdi res_id
  msm: camera: isp: Fix CSID acquire in 2PD path
  ARM: dts: msm: Add register base address for sm8150 target
  ARM: dts: msm: Add support for PWM for BoB regulator for SM8150
  msm: camera: sensor: Add support to vote for PWM mode
  msm: camera: icp: allow reconfig io during streaming
  msm: camera: sync: Protect row state read
  msm: camera: flash: Optimizing flash off operation
  msm: camera: isp: Remove additional stop CSID paths
  msm: camera: ife: Add support for 2PD pipeline
  msm: camera: sensor: Correct spelling error

Change-Id: I2d933dd6e2477bb8ebdd94eba39a67047365abec
Signed-off-by: default avatarAbhijit Trivedi <abhijitt@codeaurora.org>
parents 8c856f2d e0502b1d

Documentation/devicetree/bindings/media/video/msm-cam-cci.txt

+21 −7
Original line number Diff line number Diff line
@@ -323,6 +323,11 @@ Image sensor node contains properties of camera image sensor 
  Value type: <phandle>

  Definition: should contain regulator from which IO voltage is supplied



- cam_bob-supply

  Usage: optional

  Value type: <phandle>

  Definition: should contain regulator from which BoB voltage is supplied



- regulator-names

  Usage: required

  Value type: <string>
@@ -387,6 +392,11 @@ Image sensor node contains properties of camera image sensor 
  Value type: <u32>

  Definition: should contain regulator from which AF voltage is supplied



- pwm-switch

  Usage: optional

  Value type: <boolean>

  Definition: This property is required for regulator to switch into PWM mode.



- gpios

  Usage: required

  Value type: <phandle>
@@ -764,14 +774,18 @@ Example: 
         actuator-src = <&actuator0>;

         ois-src = <&ois0>;

         eeprom-src = <&eeprom0>;

         cam_vdig-supply = <&pm845_s3>;

         cam_vio-supply = <&pm845_lvs1>;

         cam_vana-supply = <&pmi8998_bob>;

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

         cam_vdig-supply = <&pm8009_l2>;

         cam_vio-supply = <&pm8009l_l1>;

         cam_vana-supply = <&pm8009l_l5>;

         cam_bob-supply = <&pm8150l_bob>;

         cam_clk-supply = <&tital_top_gdsc>;

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

                "cam_clk", "cam_bob";

         rgltr-cntrl-support;

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

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

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

         pwm-switch;

         rgltr-min-voltage = <0 2800000 1200000 0 3008000>;

         rgltr-max-voltage = <0 2800000 1200000 0 4000000>;

         rgltr-load-current = <0 80000 1200000 0 2000000>;

         gpio-no-mux = <0>;

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

         pinctrl-0 = <&cam_sensor_mclk0_active

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

+28 −20
Original line number Diff line number Diff line
@@ -163,8 +163,8 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

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

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

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

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

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -201,8 +201,8 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

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

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

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

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

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -240,15 +240,17 @@ 
		ois-src = <&ois_rear>;

		eeprom-src = <&eeprom_rear>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

		rgltr-min-voltage = <0 2800000 1200000 0 3008000>;

		rgltr-max-voltage = <0 2800000 1200000 0 4000000>;

		rgltr-load-current = <0 80000 1200000 0 2000000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -282,16 +284,18 @@ 
		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_vana-supply = <&pm8009_l6>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

		rgltr-min-voltage = <0 2856000 1200000 0 3008000>;

		rgltr-max-voltage = <0 2856000 1200000 0 4000000>;

		rgltr-load-current = <0 80000 1200000 0 2000000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -326,15 +330,17 @@ 
		actuator-src = <&actuator_front>;

		led-flash-src = <&led_flash_front>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l6>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

		rgltr-min-voltage = <0 2856000 1200000 0 3008000>;

		rgltr-max-voltage = <0 2856000 1200000 0 4000000>;

		rgltr-load-current = <0 80000 1200000 0 2000000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active
@@ -367,15 +373,17 @@ 
		sensor-position-yaw = <0>;

		led-flash-src = <&led_flash_iris>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

		rgltr-min-voltage = <0 2800000 1200000 0 3008000>;

		rgltr-max-voltage = <0 2800000 1200000 0 4000000>;

		rgltr-load-current = <0 80000 1200000 0 2000000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk3_active

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

+28 −20
Original line number Diff line number Diff line
@@ -163,8 +163,8 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

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

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

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

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

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -201,8 +201,8 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

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

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

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

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

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -240,15 +240,17 @@ 
		ois-src = <&ois_rear>;

		eeprom-src = <&eeprom_rear>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

		rgltr-min-voltage = <0 2800000 1200000 0 3008000>;

		rgltr-max-voltage = <0 2800000 1200000 0 4000000>;

		rgltr-load-current = <0 80000 1200000 0 2000000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -282,16 +284,18 @@ 
		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_vana-supply = <&pm8009_l6>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

		rgltr-min-voltage = <0 2856000 1200000 0 3008000>;

		rgltr-max-voltage = <0 2856000 1200000 0 4000000>;

		rgltr-load-current = <0 80000 1200000 0 2000000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -326,15 +330,17 @@ 
		actuator-src = <&actuator_front>;

		led-flash-src = <&led_flash_front>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l6>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

		rgltr-min-voltage = <0 2856000 1200000 0 3008000>;

		rgltr-max-voltage = <0 2856000 1200000 0 4000000>;

		rgltr-load-current = <0 80000 1200000 0 2000000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active
@@ -367,15 +373,17 @@ 
		sensor-position-yaw = <0>;

		led-flash-src = <&led_flash_iris>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

		rgltr-min-voltage = <0 2800000 1200000 0 3008000>;

		rgltr-max-voltage = <0 2800000 1200000 0 4000000>;

		rgltr-load-current = <0 80000 1200000 0 2000000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk3_active

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

+24 −16
Original line number Diff line number Diff line
@@ -238,15 +238,17 @@ 
		ois-src = <&ois_rear>;

		eeprom-src = <&eeprom_rear>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

		rgltr-min-voltage = <0 2800000 1200000 0 3008000>;

		rgltr-max-voltage = <0 2800000 1200000 0 4000000>;

		rgltr-load-current = <0 80000 1200000 0 2000000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -281,16 +283,18 @@ 
		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_vana-supply = <&pm8009_l6>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

		rgltr-min-voltage = <0 2856000 1200000 0 3008000>;

		rgltr-max-voltage = <0 2856000 1200000 0 4000000>;

		rgltr-load-current = <0 80000 1200000 0 2000000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -325,15 +329,17 @@ 
		eeprom-src = <&eeprom_front>;

		actuator-src = <&actuator_front>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l6>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

		rgltr-min-voltage = <0 2856000 1200000 0 3008000>;

		rgltr-max-voltage = <0 2856000 1200000 0 4000000>;

		rgltr-load-current = <0 80000 1200000 0 2000000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active
@@ -367,15 +373,17 @@ 
		sensor-position-yaw = <0>;

		led-flash-src = <&led_flash_iris>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

		rgltr-min-voltage = <0 2800000 1200000 0 3008000>;

		rgltr-max-voltage = <0 2800000 1200000 0 4000000>;

		rgltr-load-current = <0 80000 1200000 0 2000000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk3_active

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

+9 −0
Original line number Diff line number Diff line
@@ -999,6 +999,9 @@ 
	cam_ipe0: qcom,ipe0 {

		cell-index = <0>;

		compatible = "qcom,cam-ipe";

		reg = <0xac87000 0x3000>;

		reg-names = "ipe0_top";

		reg-cam-base = <0x87000>;

		regulator-names = "ipe0-vdd";

		ipe0-vdd-supply = <&ipe_0_gdsc>;

		clock-names =
@@ -1028,6 +1031,9 @@ 
	cam_ipe1: qcom,ipe1 {

		cell-index = <1>;

		compatible = "qcom,cam-ipe";

		reg = <0xac91000 0x3000>;

		reg-names = "ipe1_top";

		reg-cam-base = <0x91000>;

		regulator-names = "ipe1-vdd";

		ipe1-vdd-supply = <&ipe_1_gdsc>;

		clock-names =
@@ -1057,6 +1063,9 @@ 
	cam_bps: qcom,bps {

		cell-index = <0>;

		compatible = "qcom,cam-bps";

		reg = <0xac6f000 0x3000>;

		reg-names = "bps_top";

		reg-cam-base = <0x6f000>;

		regulator-names = "bps-vdd";

		bps-vdd-supply = <&bps_gdsc>;

		clock-names =