lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] s5p-mfc: Added support for clk_prepare

Browse Source 
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Kamil Debski
2012-02-16 10:51:56 -03:00
committed by Mauro Carvalho Chehab
parent 11a37c7097
commit eb732518e0
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/media/video/s5p-mfc/s5p_mfc_pm.c
View File

@@ -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); pm->clock_gate = clk_get(&dev->plat_dev->dev, MFC_GATE_CLK_NAME);
if (IS_ERR(pm->clock_gate)) { if (IS_ERR(pm->clock_gate)) {
mfc_err("Failed to get clock-gating control\n"); mfc_err("Failed to get clock-gating control\n");
ret = -ENOENT; ret = PTR_ERR(pm->clock_gate);
goto err_g_ip_clk; 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); pm->clock = clk_get(&dev->plat_dev->dev, MFC_CLKNAME);
if (IS_ERR(pm->clock)) { if (IS_ERR(pm->clock)) {
mfc_err("Failed to get MFC clock\n"); mfc_err("Failed to get MFC clock\n");
ret = -ENOENT; ret = PTR_ERR(pm->clock);
goto err_g_ip_clk_2; 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); atomic_set(&pm->power, 0);
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM_RUNTIME
pm->device = &dev->plat_dev->dev; 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); atomic_set(&clk_ref, 0);
#endif #endif
return 0; return 0;
err_p_ip_clk_2:
clk_put(pm->clock);
err_g_ip_clk_2: err_g_ip_clk_2:
clk_unprepare(pm->clock_gate);
err_p_ip_clk:
clk_put(pm->clock_gate); clk_put(pm->clock_gate);
err_g_ip_clk: err_g_ip_clk:
return ret; return ret;
@@ -67,7 +85,9 @@ err_g_ip_clk:
void s5p_mfc_final_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_put(pm->clock_gate);
clk_unprepare(pm->clock);
clk_put(pm->clock); clk_put(pm->clock);
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM_RUNTIME
pm_runtime_disable(pm->device); pm_runtime_disable(pm->device);