Merge "Merge remote-tracking branch 'dev/msm-4.14-camx' into msm-4.14 04/09" (ded5c3b1) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/sdmmagpie-camera-sensor-idp.dtsi

+90 −2

Original line number	Diff line number	Diff line
		@@ -67,6 +67,19 @@
		rgltr-load-current = <100000>;
		};

		actuator_triple_tele: qcom,actuator@2 {
		cell-index = <2>;
		reg = <0x2>;
		compatible = "qcom,actuator";
		cci-master = <0>;
		cam_vaf-supply = <&pm8009_s2>;
		regulator-names = "cam_vaf";
		rgltr-cntrl-support;
		rgltr-min-voltage = <2900000>;
		rgltr-max-voltage = <2900000>;
		rgltr-load-current = <100000>;
		};

		eeprom_rear: qcom,eeprom@0 {
		cell-index = <0>;
		reg = <0>;
		@@ -178,6 +191,79 @@
		clock-rates = <24000000>;
		};

		eeprom_triple_rear_aux: qcom,eeprom@3 {
		cell-index = <3>;
		reg = <0x3>;
		compatible = "qcom,eeprom";
		cam_vio-supply = <&pm8009_l7>;
		cam_vana-supply = <&pm8009_l5>;
		cam_vdig-supply = <&pm8009_l1>;
		cam_clk-supply = <&titan_top_gdsc>;
		cam_vaf-supply = <&pm8009_s2>;
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",
		"cam_clk", "cam_vaf";
		rgltr-cntrl-support;
		rgltr-min-voltage = <1800000 2800000 1100000 0 2900000>;
		rgltr-max-voltage = <1800000 2800000 1100000 0 2900000>;
		rgltr-load-current = <0 80000 105000 0 100000>;
		gpio-no-mux = <0>;
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cam_sensor_mclk0_active
		&cam_sensor_rear_active>;
		pinctrl-1 = <&cam_sensor_mclk0_suspend
		&cam_sensor_rear_suspend>;
		gpios = <&tlmm 13 0>,
		<&pm8009_gpios 1 0>;
		gpio-reset = <1>;
		gpio-req-tbl-num = <0 1>;
		gpio-req-tbl-flags = <1 0>;
		gpio-req-tbl-label = "CAMIF_MCLK0",
		"CAM_RESET0";
		sensor-mode = <0>;
		cci-master = <0>;
		status = "ok";
		clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;
		clock-names = "cam_clk";
		clock-cntl-level = "turbo";
		clock-rates = <24000000>;
		};

		eeprom_triple_uw: qcom,eeprom@4 {
		cell-index = <4>;
		reg = <0x4>;
		compatible = "qcom,eeprom";
		cam_vio-supply = <&pm8009_l7>;
		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";
		rgltr-cntrl-support;
		rgltr-min-voltage = <1800000 2800000 1050000 0>;
		rgltr-max-voltage = <1800000 2800000 1050000 0>;
		rgltr-load-current = <0 80000 105000 0>;
		gpio-no-mux = <0>;
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cam_sensor_mclk2_active
		&cam_sensor_front_active>;
		pinctrl-1 = <&cam_sensor_mclk2_suspend
		&cam_sensor_front_suspend>;
		gpios = <&tlmm 15 0>,
		<&pm8009_gpios 4 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-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-sensor@0 {
		cell-index = <0>;
		compatible = "qcom,cam-sensor";
		@@ -400,8 +486,8 @@
		sensor-position-pitch = <0>;
		sensor-position-yaw = <180>;
		led-flash-src = <&led_flash_rear_aux>;
		eeprom-src = <&eeprom_rear>;
		actuator-src = <&actuator_rear>;
		eeprom-src = <&eeprom_triple_rear_aux>;
		actuator-src = <&actuator_triple_tele>;
		cam_vio-supply = <&pm8009_l7>;
		cam_vana-supply = <&pm8009_l6>;
		cam_vdig-supply = <&pm8009_l4>;
		@@ -442,6 +528,8 @@
		sensor-position-roll = <270>;
		sensor-position-pitch = <0>;
		sensor-position-yaw = <0>;
		eeprom-src = <&eeprom_triple_uw>;
		led-flash-src = <&led_flash_rear_aux>;
		actuator-src = <&actuator_rear_aux>;
		cam_vio-supply = <&pm8009_l7>;
		cam_vana-supply = <&pm8009_l6>;

drivers/media/platform/msm/camera/cam_icp/hfi.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@
		#define HFI_MAX_POLL_TRY 5

		#define HFI_MAX_PC_POLL_TRY 150
		#define HFI_POLL_TRY_SLEEP 2
		#define HFI_POLL_TRY_SLEEP 1

		static struct hfi_info *g_hfi;
		unsigned int g_icp_mmu_hdl;
		@@ -526,7 +526,8 @@ void cam_hfi_disable_cpu(void __iomem *icp_base)
		* and Host can the proceed. No interrupt is expected from FW
		* at this time.
		*/
		msleep_interruptible(HFI_POLL_TRY_SLEEP);
		usleep_range(HFI_POLL_TRY_SLEEP * 1000,
		(HFI_POLL_TRY_SLEEP * 1000) + 1000);
		try++;
		}

drivers/media/platform/msm/camera/cam_icp/icp_hw/bps_hw/bps_core.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -164,11 +164,9 @@ static int cam_bps_handle_pc(struct cam_hw_info *bps_dev)
		CAM_CPAS_REG_CPASTOP,
		hw_info->pwr_ctrl, true, 0x1);

		if ((pwr_status >> BPS_PWR_ON_MASK)) {
		CAM_ERR(CAM_ICP, "BPS: pwr_status(%x):pwr_ctrl(%x)",
		if ((pwr_status >> BPS_PWR_ON_MASK))
		CAM_WARN(CAM_ICP, "BPS: pwr_status(%x):pwr_ctrl(%x)",
		pwr_status, pwr_ctrl);
		return -EINVAL;
		}
		}
		cam_bps_get_gdsc_control(soc_info);
		cam_cpas_reg_read(core_info->cpas_handle,

drivers/media/platform/msm/camera/cam_icp/icp_hw/ipe_hw/ipe_core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -163,7 +163,8 @@ static int cam_ipe_handle_pc(struct cam_hw_info *ipe_dev)
		hw_info->pwr_ctrl, true, 0x1);

		if (pwr_status >> IPE_PWR_ON_MASK)
		return -EINVAL;
		CAM_WARN(CAM_ICP, "BPS: pwr_status(%x):pwr_ctrl(%x)",
		pwr_status, pwr_ctrl);

		}
		cam_ipe_get_gdsc_control(soc_info);