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

Commit eb732518 authored by Kamil Debski's avatar Kamil Debski Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-mfc: Added support for clk_prepare 



Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 11a37c70

drivers/media/video/s5p-mfc/s5p_mfc_pm.c

+22 −2
Original line number Diff line number Diff line
@@ -41,15 +41,29 @@ int s5p_mfc_init_pm(struct s5p_mfc_dev *dev) 
	pm->clock_gate = clk_get(&dev->plat_dev->dev, MFC_GATE_CLK_NAME);

	if (IS_ERR(pm->clock_gate)) {

		mfc_err("Failed to get clock-gating control\n");

		ret = -ENOENT;

		ret = PTR_ERR(pm->clock_gate);

		goto err_g_ip_clk;

	}



	ret = clk_prepare(pm->clock_gate);

	if (ret) {

		mfc_err("Failed to preapre clock-gating control\n");

		goto err_p_ip_clk;

	}



	pm->clock = clk_get(&dev->plat_dev->dev, MFC_CLKNAME);

	if (IS_ERR(pm->clock)) {

		mfc_err("Failed to get MFC clock\n");

		ret = -ENOENT;

		ret = PTR_ERR(pm->clock);

		goto err_g_ip_clk_2;

	}



	ret = clk_prepare(pm->clock);

	if (ret) {

		mfc_err("Failed to prepare MFC clock\n");

		goto err_p_ip_clk_2;

	}



	atomic_set(&pm->power, 0);

#ifdef CONFIG_PM_RUNTIME

	pm->device = &dev->plat_dev->dev;
@@ -59,7 +73,11 @@ int s5p_mfc_init_pm(struct s5p_mfc_dev *dev) 
	atomic_set(&clk_ref, 0);

#endif

	return 0;

err_p_ip_clk_2:

	clk_put(pm->clock);

err_g_ip_clk_2:

	clk_unprepare(pm->clock_gate);

err_p_ip_clk:

	clk_put(pm->clock_gate);

err_g_ip_clk:

	return ret;
@@ -67,7 +85,9 @@ int s5p_mfc_init_pm(struct s5p_mfc_dev *dev) 


void s5p_mfc_final_pm(struct s5p_mfc_dev *dev)

{

	clk_unprepare(pm->clock_gate);

	clk_put(pm->clock_gate);

	clk_unprepare(pm->clock);

	clk_put(pm->clock);

#ifdef CONFIG_PM_RUNTIME

	pm_runtime_disable(pm->device);