Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[linux-2.6-microblaze.git] / drivers / devfreq / Kconfig

diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig
index 3553583..0b1df12 100644 (file)
--- a/drivers/devfreq/Kconfig
+++ b/drivers/devfreq/Kconfig
@@ -77,7 +77,7 @@ config DEVFREQ_GOV_PASSIVE
 comment "DEVFREQ Drivers"
 
 config ARM_EXYNOS_BUS_DEVFREQ
-       tristate "ARM EXYNOS Generic Memory Bus DEVFREQ Driver"
+       tristate "ARM Exynos Generic Memory Bus DEVFREQ Driver"
        depends on ARCH_EXYNOS || COMPILE_TEST
        select DEVFREQ_GOV_SIMPLE_ONDEMAND
        select DEVFREQ_GOV_PASSIVE
@@ -91,6 +91,16 @@ config ARM_EXYNOS_BUS_DEVFREQ
          and adjusts the operating frequencies and voltages with OPP support.
          This does not yet operate with optimal voltages.
 
+config ARM_IMX8M_DDRC_DEVFREQ
+       tristate "i.MX8M DDRC DEVFREQ Driver"
+       depends on (ARCH_MXC && HAVE_ARM_SMCCC) || \
+               (COMPILE_TEST && HAVE_ARM_SMCCC)
+       select DEVFREQ_GOV_SIMPLE_ONDEMAND
+       select DEVFREQ_GOV_USERSPACE
+       help
+         This adds the DEVFREQ driver for the i.MX8M DDR Controller. It allows
+         adjusting DRAM frequency.
+
 config ARM_TEGRA_DEVFREQ
        tristate "NVIDIA Tegra30/114/124/210 DEVFREQ Driver"
        depends on ARCH_TEGRA_3x_SOC || ARCH_TEGRA_114_SOC || \
@@ -115,14 +125,15 @@ config ARM_TEGRA20_DEVFREQ
 
 config ARM_RK3399_DMC_DEVFREQ
        tristate "ARM RK3399 DMC DEVFREQ Driver"
-       depends on ARCH_ROCKCHIP
+       depends on (ARCH_ROCKCHIP && HAVE_ARM_SMCCC) || \
+               (COMPILE_TEST && HAVE_ARM_SMCCC)
        select DEVFREQ_EVENT_ROCKCHIP_DFI
        select DEVFREQ_GOV_SIMPLE_ONDEMAND
        select PM_DEVFREQ_EVENT
        help
-          This adds the DEVFREQ driver for the RK3399 DMC(Dynamic Memory Controller).
-          It sets the frequency for the memory controller and reads the usage counts
-          from hardware.
+         This adds the DEVFREQ driver for the RK3399 DMC(Dynamic Memory Controller).
+         It sets the frequency for the memory controller and reads the usage counts
+         from hardware.
 
 source "drivers/devfreq/event/Kconfig"