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

Commit 87b21110 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "UPSTREAM: Merge commit '870305ba' into msm-4.9 (PC30-PC35) 11/19"

parents fd32b3a6 817e4d88

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

+10 −3
Original line number Diff line number Diff line
@@ -180,6 +180,9 @@ Optional properties: 
  should contain phandle of respective ir-cut node

- qcom,special-support-sensors: if only some special sensors are supported

  on this board, add sensor name in this property.

- use-shared-clk : It is booloean property. This property is required

  if the clk is shared clk between different sensor and ois, if this

  device need to be opened together.

- clock-rates: clock rate in Hz.

- clock-cntl-level: says what all different cloc level node has.

- clock-cntl-support: Says whether clock control support is present or not
@@ -248,6 +251,9 @@ Optional properties: 
  required from the regulators mentioned in the regulator-names property

  (in the same order).

- cam_vaf-supply : should contain regulator from which ois voltage is supplied

- use-shared-clk : It is booloean property. This property is required

  if the clk is shared clk between different sensor and ois, if this

  device need to be opened together.



Example:
@@ -354,8 +360,8 @@ qcom,cci@0xfda0c000 { 
         status = "ok";

         shared-gpios = <18 19>;

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

         pinctrl-0 = <&cam_res_mgr_active>;

         pinctrl-1 = <&cam_res_mgr_suspend>;

         pinctrl-0 = <&cam_shared_clk_active &cam_res_mgr_active>;

         pinctrl-1 = <&cam_shared_clk_suspend &cam_res_mgr_suspend>;

    };



    qcom,cam-sensor@0 {
@@ -398,6 +404,7 @@ qcom,cci@0xfda0c000 { 
         sensor-mode = <0>;

         cci-master = <0>;

         status = "ok";

         use-shared-clk;

         clocks = <&clock_mmss clk_mclk0_clk_src>,

               <&clock_mmss clk_camss_mclk0_clk>;

         clock-names = "cam_src_clk", "cam_clk";

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

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ 
		rgltr-cntrl-support;

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -234,7 +234,7 @@ 
		rgltr-cntrl-support;

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active

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

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ 
		rgltr-cntrl-support;

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -234,7 +234,7 @@ 
		rgltr-cntrl-support;

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active

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

+1 −1
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ 
		clock-rates =

			<0 0 0 0 0 0 384000000 0 0 0 404000000 0>,

			<0 0 0 0 0 0 538000000 0 0 0 600000000 0>;

		clock-cntl-level = "svs";

		clock-cntl-level = "svs", "turbo";

		src-clock-name = "ife_csid_clk_src";

		status = "ok";

	};

drivers/media/platform/msm/camera/cam_core/cam_context.c

+2 −2
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ int cam_context_handle_crm_unlink(struct cam_context *ctx, 
		rc = ctx->state_machine[ctx->state].crm_ops.unlink(

			ctx, unlink);

	} else {

		CAM_ERR(CAM_CORE, "No crm unlink in dev %d, state %d",

			ctx->dev_hdl, ctx->state);

		CAM_ERR(CAM_CORE, "No crm unlink in dev %d, name %s, state %d",

			ctx->dev_hdl, ctx->dev_name, ctx->state);

		rc = -EPROTO;

	}

	mutex_unlock(&ctx->ctx_mutex);