diff options
| author | Jacek Anaszewski <j.anaszewski@samsung.com> | 2014-11-05 16:03:30 +0100 |
|---|---|---|
| committer | Jacek Anaszewski <j.anaszewski@samsung.com> | 2014-11-05 16:05:33 +0100 |
| commit | 8decfed3e057a8842dcbdee25c1e9c6643963e1f (patch) | |
| tree | 4072376455e044a28ce00656e4adde5f89e358f9 | |
| parent | a6382790da6d6138a72d566ac93e8ad21fc391e0 (diff) | |
| download | linux-3.10-8decfed3e057a8842dcbdee25c1e9c6643963e1f.tar.gz linux-3.10-8decfed3e057a8842dcbdee25c1e9c6643963e1f.tar.bz2 linux-3.10-8decfed3e057a8842dcbdee25c1e9c6643963e1f.zip | |
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.c | 13 |
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 657be1bc793..9e238528141 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 |