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

Commit 22697d3d authored by Suresh Vankadara's avatar Suresh Vankadara
Browse files

msm: camera: icp: Cleanup FW message handling 



Handling frame done result from firmware, additional error
checks are added in frame done processing. Using context
lock instead of frame process lock, because frame done message
is related to a firmware context.

Change-Id: Iec82da8c3bb6e3282cbf0987a10869e122070362
Signed-off-by: default avatarSuresh Vankadara <svankada@codeaurora.org>
parent d88ee02e

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

+7 −8
Original line number Diff line number Diff line
@@ -18,10 +18,9 @@ of A5, IPE and BPS devices present on the hardware. 
  Definition: Should be "qcom,cam-icp".



- compat-hw-name



  Usage: required

  Value type: <string>

  Definition: Should be "qcom,a5" or "qcom,ipe".

  Definition: Should be "qcom,a5" or "qcom,ipe0" or "qcom,ipe1" or "qcom,bps".



- num-a5

  Usage: required
@@ -63,7 +62,7 @@ and name of firmware image. 
- compatible

  Usage: required

  Value type: <string>

  Definition: Should be "qcom,cam-cdm-intf".

  Definition: Should be "qcom,cam-a5" or "qcom,cam-ipe" or "qcom,cam-bps".



- reg-names

  Usage: optional
@@ -128,9 +127,9 @@ and name of firmware image. 
  Definition: Name of firmware image.



Examples:

a5: qcom,a5@a10000 {

a5: qcom,a5@ac00000 {

	cell-index = <0>;

	compatible = "qcom,cam_a5";

	compatible = "qcom,cam-a5";

	reg = <0xac00000 0x6000>,

		<0xac10000 0x8000>,

		<0xac18000 0x3000>;
@@ -169,7 +168,7 @@ a5: qcom,a5@a10000 { 


qcom,ipe0 {

	cell-index = <0>;

	compatible = "qcom,cam_ipe";

	compatible = "qcom,cam-ipe";

	regulator-names = "ipe0-vdd";

	ipe0-vdd-supply = <&ipe_0_gdsc>;

	clock-names = "ipe_0_ahb_clk",
@@ -189,7 +188,7 @@ qcom,ipe0 { 


qcom,ipe1 {

	cell-index = <1>;

	compatible = "qcom,cam_ipe";

	compatible = "qcom,cam-ipe";

	regulator-names = "ipe1-vdd";

	ipe1-vdd-supply = <&ipe_1_gdsc>;

	clock-names = "ipe_1_ahb_clk",
@@ -209,7 +208,7 @@ qcom,ipe1 { 


bps: qcom,bps {

	cell-index = <0>;

	compatible = "qcom,cam_bps";

	compatible = "qcom,cam-bps";

	regulator-names = "bps-vdd";

	bps-vdd-supply = <&bps_gdsc>;

	clock-names = "bps_ahb_clk",

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

+4 −4
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ 


	cam_a5: qcom,a5@ac00000 {

		cell-index = <0>;

		compatible = "qcom,cam_a5";

		compatible = "qcom,cam-a5";

		reg = <0xac00000 0x6000>,

			<0xac10000 0x8000>,

			<0xac18000 0x3000>;
@@ -832,7 +832,7 @@ 


	cam_ipe0: qcom,ipe0 {

		cell-index = <0>;

		compatible = "qcom,cam_ipe";

		compatible = "qcom,cam-ipe";

		regulator-names = "ipe0-vdd";

		ipe0-vdd-supply = <&ipe_0_gdsc>;

		clock-names = "ipe_0_ahb_clk",
@@ -853,7 +853,7 @@ 


	cam_ipe1: qcom,ipe1 {

		cell-index = <1>;

		compatible = "qcom,cam_ipe";

		compatible = "qcom,cam-ipe";

		regulator-names = "ipe1-vdd";

		ipe1-vdd-supply = <&ipe_1_gdsc>;

		clock-names = "ipe_1_ahb_clk",
@@ -874,7 +874,7 @@ 


	cam_bps: qcom,bps {

		cell-index = <0>;

		compatible = "qcom,cam_bps";

		compatible = "qcom,cam-bps";

		regulator-names = "bps-vdd";

		bps-vdd-supply = <&bps_gdsc>;

		clock-names = "bps_ahb_clk",

drivers/media/platform/msm/camera/cam_icp/icp_hw/a5_hw/a5_dev.c

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ int cam_a5_probe(struct platform_device *pdev) 


static const struct of_device_id cam_a5_dt_match[] = {

	{

		.compatible = "qcom,cam_a5",

		.compatible = "qcom,cam-a5",

		.data = &cam_a5_hw_info,

	},

	{}
@@ -176,7 +176,7 @@ MODULE_DEVICE_TABLE(of, cam_a5_dt_match); 
static struct platform_driver cam_a5_driver = {

	.probe = cam_a5_probe,

	.driver = {

		.name = "cam_a5",

		.name = "cam-a5",

		.owner = THIS_MODULE,

		.of_match_table = cam_a5_dt_match,

	},

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

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ int cam_bps_probe(struct platform_device *pdev) 


static const struct of_device_id cam_bps_dt_match[] = {

	{

		.compatible = "qcom,cam_bps",

		.compatible = "qcom,cam-bps",

		.data = &cam_bps_hw_info,

	},

	{}
@@ -145,7 +145,7 @@ MODULE_DEVICE_TABLE(of, cam_bps_dt_match); 
static struct platform_driver cam_bps_driver = {

	.probe = cam_bps_probe,

	.driver = {

		.name = "cam_bps",

		.name = "cam-bps",

		.owner = THIS_MODULE,

		.of_match_table = cam_bps_dt_match,

	},

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+234 −143

File changed.

Preview size limit exceeded, changes collapsed.