Merge "UPSTREAM commit '0f6c2abb2ef85d42a0736a7f7f3095763ac18a2a' to msm-4.14" (55a0f45b) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -242,8 +242,8 @@
		clock-cntl-level = "lowsvs";
		clock-rates = <37500000 0>;
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cci2_active &cci2_active>;
		pinctrl-1 = <&cci3_suspend &cci3_suspend>;
		pinctrl-0 = <&cci2_active &cci3_active>;
		pinctrl-1 = <&cci2_suspend &cci3_suspend>;
		gpios = <&tlmm 31 0>,
		<&tlmm 32 0>,
		<&tlmm 33 0>,

+1 −0

Original line number	Diff line number	Diff line
		@@ -1125,6 +1125,7 @@ static struct platform_driver cam_hw_cdm_driver = {
		.name = "msm_cam_cdm",
		.owner = THIS_MODULE,
		.of_match_table = msm_cam_hw_cdm_dt_match,
		.suppress_bind_attrs = true,
		},
		};

+1 −0

Original line number	Diff line number	Diff line
		@@ -562,6 +562,7 @@ static struct platform_driver cam_cdm_intf_driver = {
		.name = "msm_cam_cdm_intf",
		.owner = THIS_MODULE,
		.of_match_table = msm_cam_cdm_intf_dt_match,
		.suppress_bind_attrs = true,
		},
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ int cam_context_shutdown(struct cam_context *ctx)
		}

		if (!rc)
		cam_destroy_device_hdl(ctx_hdl);
		rc = cam_destroy_device_hdl(ctx_hdl);
		return rc;
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -490,6 +490,7 @@ int32_t cam_context_acquire_dev_to_hw(struct cam_context *ctx,
		release.ctxt_to_hw_map = ctx->ctxt_to_hw_map;
		ctx->hw_mgr_intf->hw_release(ctx->hw_mgr_intf->hw_mgr_priv, &release);
		ctx->ctxt_to_hw_map = NULL;
		ctx->dev_hdl = -1;
		end:
		return rc;
		}
		@@ -504,6 +505,7 @@ int32_t cam_context_flush_ctx_to_hw(struct cam_context *ctx)
		bool free_req;

		CAM_DBG(CAM_CTXT, "[%s] E: NRT flush ctx", ctx->dev_name);
		memset(&flush_args, 0, sizeof(flush_args));

		/*
		* flush pending requests, take the sync lock to synchronize with the
		@@ -670,6 +672,7 @@ int32_t cam_context_flush_req_to_hw(struct cam_context *ctx,

		CAM_DBG(CAM_CTXT, "[%s] E: NRT flush req", ctx->dev_name);

		memset(&flush_args, 0, sizeof(flush_args));
		flush_args.num_req_pending = 0;
		flush_args.num_req_active = 0;
		mutex_lock(&ctx->sync_mutex);