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

Commit 435d64ad 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 remote-tracking branch 'quic/dev/msm-4.9-camx' into mainline (msm-4.9)"

parents b9158941 09640585

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

+3 −0
Original line number Diff line number Diff line
@@ -2753,6 +2753,7 @@ 
				pins = "gpio80","gpio79";

				bias-pull-down; /* PULL DOWN */

				drive-strength = <2>; /* 2 MA */

				output-low;

			};

		};
@@ -2809,6 +2810,7 @@ 
				pins = "gpio28";

				bias-pull-down; /* PULL DOWN */

				drive-strength = <2>; /* 2 MA */

				output-low;

			};

		};
@@ -2866,6 +2868,7 @@ 
				pins = "gpio9","gpio8";

				bias-pull-down; /* PULL DOWN */

				drive-strength = <2>; /* 2 MA */

				output-low;

			};

		};

drivers/media/platform/msm/camera/cam_cdm/cam_cdm_hw_core.c

+2 −12
Original line number Diff line number Diff line
@@ -785,18 +785,6 @@ int cam_hw_cdm_init(void *hw_priv, 
	time_left = wait_for_completion_timeout(&cdm_core->reset_complete,

		msecs_to_jiffies(CAM_CDM_HW_RESET_TIMEOUT));



	/*

	 * Check for HW error and recover as a workaround

	 * Sometimes CDM HW triggers irq with invalid status for

	 * HW reset command, so ignore reset failure and proceed further

	 * as a workaround.

	 */

	if (time_left <= 0) {

		CAM_ERR(CAM_CDM, "CDM HW reset Wait failed time_left=%ld",

			time_left);

		time_left = 1;

	}



	if (time_left <= 0) {

		CAM_ERR(CAM_CDM, "CDM HW reset Wait failed rc=%d", rc);

		goto disable_return;
@@ -869,6 +857,8 @@ int cam_hw_cdm_probe(struct platform_device *pdev) 


	cdm_hw->hw_state = CAM_HW_STATE_POWER_DOWN;

	cdm_hw->soc_info.pdev = pdev;

	cdm_hw->soc_info.dev = &pdev->dev;

	cdm_hw->soc_info.dev_name = pdev->name;

	cdm_hw_intf->hw_type = CAM_HW_CDM;

	cdm_hw->open_count = 0;

	mutex_init(&cdm_hw->hw_mutex);

drivers/media/platform/msm/camera/cam_cpas/cam_cpas_hw.c

+2 −0
Original line number Diff line number Diff line
@@ -1338,6 +1338,8 @@ int cam_cpas_hw_probe(struct platform_device *pdev, 


	cpas_hw->hw_state = CAM_HW_STATE_POWER_DOWN;

	cpas_hw->soc_info.pdev = pdev;

	cpas_hw->soc_info.dev = &pdev->dev;

	cpas_hw->soc_info.dev_name = pdev->name;

	cpas_hw->open_count = 0;

	mutex_init(&cpas_hw->hw_mutex);

	spin_lock_init(&cpas_hw->hw_lock);

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

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ int cam_a5_probe(struct platform_device *pdev) 
	}



	a5_dev->soc_info.pdev = pdev;

	a5_dev->soc_info.dev = &pdev->dev;

	a5_dev->soc_info.dev_name = pdev->name;

	a5_dev_intf->hw_priv = a5_dev;

	a5_dev_intf->hw_ops.init = cam_a5_init_hw;

	a5_dev_intf->hw_ops.deinit = cam_a5_deinit_hw;

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

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ int cam_bps_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}

	bps_dev->soc_info.pdev = pdev;

	bps_dev->soc_info.dev = &pdev->dev;

	bps_dev->soc_info.dev_name = pdev->name;

	bps_dev_intf->hw_priv = bps_dev;

	bps_dev_intf->hw_ops.init = cam_bps_init_hw;

	bps_dev_intf->hw_ops.deinit = cam_bps_deinit_hw;