summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Anaszewski <j.anaszewski@samsung.com>2014-11-05 15:03:30 (GMT)
committerChanho Park <chanho61.park@samsung.com>2014-11-18 03:01:15 (GMT)
commit4dfe3b7a922bc920c5cb984b2beb40cbc0480397 (patch)
treeed8b0982eff72a747c695df1fb3672ee64a0c91c
parent9beaf054bf4a66f5025a8733b1f4fcd1e065b2f7 (diff)
downloadlinux-3.10-4dfe3b7a922bc920c5cb984b2beb40cbc0480397.zip
linux-3.10-4dfe3b7a922bc920c5cb984b2beb40cbc0480397.tar.gz
linux-3.10-4dfe3b7a922bc920c5cb984b2beb40cbc0480397.tar.bz2
Revert "media: s5p-mfc: add to set clock rate"
This reverts commit 2cbd58556a83b417750483de842e1e918de273a3. Mainline commit d19f405a "Fix selective sclk_mfc init" solves the issue in a wider scope. Change-Id: Ib163697c3ae65e30b6e13f6f7170d791d853a6f0 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc_pm.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
index 657be1b..9e238528 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
@@ -21,8 +21,6 @@
#include "s5p_mfc_pm.h"
#define MFC_GATE_CLK_NAME "mfc"
-#define MFC_CLK_NAME "sclk_mfc"
-#define MFC_CLK_RATE (200 * 1000000)
#define CLK_DEBUG
@@ -52,14 +50,6 @@ int s5p_mfc_init_pm(struct s5p_mfc_dev *dev)
goto err_p_ip_clk;
}
- pm->clock = clk_get(&dev->plat_dev->dev, MFC_CLK_NAME);
- if (IS_ERR(pm->clock)) {
- mfc_err("Failed to get gating clock control\n");
- ret = PTR_ERR(pm->clock);
- goto err_g_clk;
- }
- clk_set_rate(pm->clock, MFC_CLK_RATE);
-
atomic_set(&pm->power, 0);
#ifdef CONFIG_PM_RUNTIME
pm->device = &dev->plat_dev->dev;
@@ -69,8 +59,6 @@ int s5p_mfc_init_pm(struct s5p_mfc_dev *dev)
atomic_set(&clk_ref, 0);
#endif
return 0;
-err_g_clk:
- clk_disable_unprepare(pm->clock_gate);
err_p_ip_clk:
clk_put(pm->clock_gate);
err_g_ip_clk:
@@ -79,7 +67,6 @@ err_g_ip_clk:
void s5p_mfc_final_pm(struct s5p_mfc_dev *dev)
{
- clk_put(pm->clock);
clk_unprepare(pm->clock_gate);
clk_put(pm->clock_gate);
#ifdef CONFIG_PM_RUNTIME