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

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

Merge "msm:isp: Dynamically allocate the memory for ISP Clocks."

parents 67834704 6fe02b9a

drivers/media/platform/msm/camera_v2/isp/msm_isp.h

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ struct vfe_device { 
	struct device *iommu_secure_ctx[MAX_IOMMU_CTX];



	struct regulator *fs_vfe;

	struct clk *vfe_clk[7];

	struct clk **vfe_clk;

	uint32_t num_clk;



	uint32_t bus_perf_client;

drivers/media/platform/msm/camera_v2/isp/msm_isp32.c

+14 −1
Original line number Diff line number Diff line
@@ -79,7 +79,18 @@ static int msm_vfe32_init_hardware(struct vfe_device *vfe_dev) 
			goto fs_failed;

		}

	}



	if (vfe_dev->num_clk <= 0) {

		pr_err("%s: Invalid num of clock\n", __func__);

		goto fs_failed;

	} else {

		vfe_dev->vfe_clk =

			kzalloc(sizeof(struct clk *) * vfe_dev->num_clk,

			GFP_KERNEL);

		if (!vfe_dev->vfe_clk) {

			pr_err("%s:%d No memory\n", __func__, __LINE__);

			return -ENOMEM;

		}

	}

	rc = msm_cam_clk_enable(&vfe_dev->pdev->dev, msm_vfe32_1_clk_info,

		 vfe_dev->vfe_clk, ARRAY_SIZE(msm_vfe32_1_clk_info), 1);

	if (rc < 0) {
@@ -123,6 +134,7 @@ vfe_remap_failed: 
clk_enable_failed:

	if (vfe_dev->fs_vfe)

		regulator_disable(vfe_dev->fs_vfe);

	kfree(vfe_dev->vfe_clk);

fs_failed:

	msm_isp_deinit_bandwidth_mgr(ISP_VFE0 + vfe_dev->pdev->id);

bus_scale_register_failed:
@@ -142,6 +154,7 @@ static void msm_vfe32_release_hardware(struct vfe_device *vfe_dev) 
		msm_cam_clk_enable(&vfe_dev->pdev->dev,

				msm_vfe32_2_clk_info, vfe_dev->vfe_clk,

				ARRAY_SIZE(msm_vfe32_2_clk_info), 0);

	kfree(vfe_dev->vfe_clk);

	regulator_disable(vfe_dev->fs_vfe);

	msm_isp_deinit_bandwidth_mgr(ISP_VFE0 + vfe_dev->pdev->id);

}

drivers/media/platform/msm/camera_v2/isp/msm_isp40.c

+15 −2
Original line number Diff line number Diff line
@@ -267,7 +267,18 @@ static int msm_vfe40_init_hardware(struct vfe_device *vfe_dev) 
		pr_err("msm_isp_get_clk_info() failed\n");

		goto fs_failed;

	}



	if (vfe_dev->num_clk <= 0) {

		pr_err("%s: Invalid num of clock\n", __func__);

		goto fs_failed;

	} else {

		vfe_dev->vfe_clk =

			kzalloc(sizeof(struct clk *) * vfe_dev->num_clk,

			GFP_KERNEL);

		if (!vfe_dev->vfe_clk) {

			pr_err("%s:%d No memory\n", __func__, __LINE__);

			return -ENOMEM;

		}

	}

	rc = msm_cam_clk_enable(&vfe_dev->pdev->dev, msm_vfe40_clk_info,

		vfe_dev->vfe_clk, vfe_dev->num_clk, 1);

	if (rc < 0)
@@ -302,10 +313,11 @@ vbif_remap_failed: 
	iounmap(vfe_dev->vfe_base);

vfe_remap_failed:

	msm_cam_clk_enable(&vfe_dev->pdev->dev, msm_vfe40_clk_info,

		vfe_dev->vfe_clk, ARRAY_SIZE(msm_vfe40_clk_info), 0);

		vfe_dev->vfe_clk, vfe_dev->num_clk, 0);

clk_enable_failed:

	if (vfe_dev->fs_vfe)

		regulator_disable(vfe_dev->fs_vfe);

	kfree(vfe_dev->vfe_clk);

fs_failed:

	msm_isp_deinit_bandwidth_mgr(ISP_VFE0 + vfe_dev->pdev->id);

bus_scale_register_failed:
@@ -320,6 +332,7 @@ static void msm_vfe40_release_hardware(struct vfe_device *vfe_dev) 
	iounmap(vfe_dev->vfe_base);

	msm_cam_clk_enable(&vfe_dev->pdev->dev, msm_vfe40_clk_info,

		vfe_dev->vfe_clk, vfe_dev->num_clk, 0);

	kfree(vfe_dev->vfe_clk);

	regulator_disable(vfe_dev->fs_vfe);

	msm_isp_deinit_bandwidth_mgr(ISP_VFE0 + vfe_dev->pdev->id);

}

drivers/media/platform/msm/camera_v2/isp/msm_isp44.c

+14 −1
Original line number Diff line number Diff line
@@ -168,7 +168,18 @@ static int msm_vfe44_init_hardware(struct vfe_device *vfe_dev) 
		pr_err("msm_isp_get_clk_info() failed\n");

		goto fs_failed;

	}



	if (vfe_dev->num_clk <= 0) {

		pr_err("%s: Invalid num of clock\n", __func__);

		goto fs_failed;

	} else {

		vfe_dev->vfe_clk =

			kzalloc(sizeof(struct clk *) * vfe_dev->num_clk,

			GFP_KERNEL);

		if (!vfe_dev->vfe_clk) {

			pr_err("%s:%d No memory\n", __func__, __LINE__);

			return -ENOMEM;

		}

	}

	rc = msm_cam_clk_enable(&vfe_dev->pdev->dev, msm_vfe44_clk_info,

		vfe_dev->vfe_clk, vfe_dev->num_clk, 1);

	if (rc < 0)
@@ -207,6 +218,7 @@ vfe_remap_failed: 
clk_enable_failed:

	if (vfe_dev->fs_vfe)

		regulator_disable(vfe_dev->fs_vfe);

	kfree(vfe_dev->vfe_clk);

fs_failed:

	msm_isp_deinit_bandwidth_mgr(ISP_VFE0 + vfe_dev->pdev->id);

bus_scale_register_failed:
@@ -221,6 +233,7 @@ static void msm_vfe44_release_hardware(struct vfe_device *vfe_dev) 
	iounmap(vfe_dev->vfe_base);

	msm_cam_clk_enable(&vfe_dev->pdev->dev, msm_vfe44_clk_info,

		vfe_dev->vfe_clk, vfe_dev->num_clk, 0);

	kfree(vfe_dev->vfe_clk);

	regulator_disable(vfe_dev->fs_vfe);

	msm_isp_deinit_bandwidth_mgr(ISP_VFE0 + vfe_dev->pdev->id);

}

drivers/media/platform/msm/camera_v2/isp/msm_isp46.c

+14 −1
Original line number Diff line number Diff line
@@ -198,7 +198,18 @@ static int msm_vfe46_init_hardware(struct vfe_device *vfe_dev) 
		pr_err("msm_isp_get_clk_info() failed\n");

		goto fs_failed;

	}



	if (vfe_dev->num_clk <= 0) {

		pr_err("%s: Invalid num of clock\n", __func__);

		goto fs_failed;

	} else {

		vfe_dev->vfe_clk =

			kzalloc(sizeof(struct clk *) * vfe_dev->num_clk,

			GFP_KERNEL);

		if (!vfe_dev->vfe_clk) {

			pr_err("%s:%d No memory\n", __func__, __LINE__);

			return -ENOMEM;

		}

	}

	rc = msm_cam_clk_enable(&vfe_dev->pdev->dev, msm_vfe46_clk_info,

		vfe_dev->vfe_clk, vfe_dev->num_clk, 1);

	if (rc < 0)
@@ -237,6 +248,7 @@ vfe_remap_failed: 
clk_enable_failed:

	if (vfe_dev->fs_vfe)

		regulator_disable(vfe_dev->fs_vfe);

	kfree(vfe_dev->vfe_clk);

fs_failed:

	msm_isp_deinit_bandwidth_mgr(ISP_VFE0 + vfe_dev->pdev->id);

bus_scale_register_failed:
@@ -251,6 +263,7 @@ static void msm_vfe46_release_hardware(struct vfe_device *vfe_dev) 
	iounmap(vfe_dev->vfe_base);

	msm_cam_clk_enable(&vfe_dev->pdev->dev, msm_vfe46_clk_info,

		vfe_dev->vfe_clk, vfe_dev->num_clk, 0);

	kfree(vfe_dev->vfe_clk);

	regulator_disable(vfe_dev->fs_vfe);

	msm_isp_deinit_bandwidth_mgr(ISP_VFE0 + vfe_dev->pdev->id);

}