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

Commit 249ccba4 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: update soc util functionality to make it more generic" into dev/msm-4.9-camx

parents 0ca771c6 b7b49f13

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

+2 −0
Original line number Diff line number Diff line
@@ -869,6 +869,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;

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

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

	}

	ipe_dev->soc_info.pdev = pdev;

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

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

	ipe_dev_intf->hw_priv = ipe_dev;

	ipe_dev_intf->hw_ops.init = cam_ipe_init_hw;

	ipe_dev_intf->hw_ops.deinit = cam_ipe_deinit_hw;