Merge tag 'for-linus-3.11-merge-window-part-1' of git://git.kernel.org/pub/scm/linux...

[deliverable/linux.git] / drivers / devfreq / Kconfig

diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig
index 0f079be133051540c62d8c83d03579e132f7d6bd..31f3adba4cf3f15a693e0f3ae40d921e53a576c5 100644 (file)
--- a/drivers/devfreq/Kconfig
+++ b/drivers/devfreq/Kconfig
@@ -67,7 +67,7 @@ comment "DEVFREQ Drivers"
 
 config ARM_EXYNOS4_BUS_DEVFREQ
        bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver"
-       depends on CPU_EXYNOS4210 || CPU_EXYNOS4212 || CPU_EXYNOS4412
+       depends on CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412
        select ARCH_HAS_OPP
        select DEVFREQ_GOV_SIMPLE_ONDEMAND
        help
@@ -78,4 +78,14 @@ config ARM_EXYNOS4_BUS_DEVFREQ
          To operate with optimal voltages, ASV support is required
          (CONFIG_EXYNOS_ASV).
 
+config ARM_EXYNOS5_BUS_DEVFREQ
+       bool "ARM Exynos5250 Bus DEVFREQ Driver"
+       depends on SOC_EXYNOS5250
+       select ARCH_HAS_OPP
+       select DEVFREQ_GOV_SIMPLE_ONDEMAND
+       help
+         This adds the DEVFREQ driver for Exynos5250 bus interface (vdd_int).
+         It reads PPMU counters of memory controllers and adjusts the
+         operating frequencies and voltages with OPP support.
+
 endif # PM_DEVFREQ