diff options
| author | Sooman Jeong <sm5.jeong@samsung.com> | 2016-11-03 13:14:03 +0900 |
|---|---|---|
| committer | Sooman Jeong <sm5.jeong@samsung.com> | 2016-11-03 13:14:23 +0900 |
| commit | 063acbebddea2c3268fd4df8baf4cedd792fc0c7 (patch) | |
| tree | 42d14a280c6db5ed508350dbbc830a408726057d | |
| parent | 0a55a8acbe9d3d0d131b82b9262c5ef5eb740ec7 (diff) | |
| download | linux-artik7-063acbebddea2c3268fd4df8baf4cedd792fc0c7.tar.gz linux-artik7-063acbebddea2c3268fd4df8baf4cedd792fc0c7.tar.bz2 linux-artik7-063acbebddea2c3268fd4df8baf4cedd792fc0c7.zip | |
Revert "media: nexell: add 800MHz CPU min lock for clipper device"
This reverts commit 71a46bd492f0df4eb70148ab6c895631f147a46c.
Since we fixed root cause by applying below commit,
we don't need this work-around anymore.
commit 0a55a8acbe9d3d0d131b82b9262c5ef5eb740ec7
Change-Id: I398ee496cf95413cd4b035c10994275629a61eea
Signed-off-by: Sooman Jeong <sm5.jeong@samsung.com>
| -rw-r--r-- | drivers/media/platform/nexell/capture/nx-clipper.c | 19 | ||||
| -rw-r--r-- | include/linux/soc/nexell/cpufreq.h | 1 |
2 files changed, 0 insertions, 20 deletions
diff --git a/drivers/media/platform/nexell/capture/nx-clipper.c b/drivers/media/platform/nexell/capture/nx-clipper.c index c55851104fbf..a9e50867e3f1 100644 --- a/drivers/media/platform/nexell/capture/nx-clipper.c +++ b/drivers/media/platform/nexell/capture/nx-clipper.c @@ -81,19 +81,6 @@ static void nx_clipper_qos_cpu_online_update(int val) else pm_qos_update_request(&nx_clipper_qos_cpu_online, val); } - -#ifdef CONFIG_ARCH_S5P4418 -static struct pm_qos_request nx_clipper_cpu_qos; - -static void nx_clipper_cpu_qos_update(int val) -{ - if (!pm_qos_request_active(&nx_clipper_cpu_qos)) - pm_qos_add_request(&nx_clipper_cpu_qos, - PM_QOS_CPU_FREQ_MIN, val); - else - pm_qos_update_request(&nx_clipper_cpu_qos, val); -} -#endif #endif enum { @@ -1170,9 +1157,6 @@ static int nx_clipper_s_stream(struct v4l2_subdev *sd, int enable) #ifdef CONFIG_ARM_S5Pxx18_DEVFREQ nx_clipper_qos_update(NX_BUS_CLK_VIP_KHZ); nx_clipper_qos_cpu_online_update(1); -#ifdef CONFIG_ARCH_S5P4418 - nx_clipper_cpu_qos_update(NX_CPU_CLK_VIP_KHZ); -#endif #endif set_vip(me); @@ -1246,9 +1230,6 @@ static int nx_clipper_s_stream(struct v4l2_subdev *sd, int enable) #ifdef CONFIG_ARM_S5Pxx18_DEVFREQ nx_clipper_qos_update(NX_BUS_CLK_IDLE_KHZ); nx_clipper_qos_cpu_online_update(-1); -#ifdef CONFIG_ARCH_S5P4418 - nx_clipper_cpu_qos_update(-1); -#endif #endif #ifndef CONFIG_VIDEO_NEXELL_CLIPPER diff --git a/include/linux/soc/nexell/cpufreq.h b/include/linux/soc/nexell/cpufreq.h index d04e363cbd36..cda910df3479 100644 --- a/include/linux/soc/nexell/cpufreq.h +++ b/include/linux/soc/nexell/cpufreq.h @@ -54,7 +54,6 @@ void nx_pll_set_rate(int PLL, int P, int M, int S); #if defined(CONFIG_ARCH_S5P4418) #define NX_CPU_CLK_AUDIO_KHZ 800000 -#define NX_CPU_CLK_VIP_KHZ 800000 #endif void nx_bus_qos_update(int val); |