diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 21:05:37 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 21:05:37 +0200 |
commit | 28363d9357f0ad73644f613202880849ebba6acb (patch) | |
tree | 910d5dfd6d922381d6d60b2335329d78c3ff2f3f /arch/arm/configs/multi_v7_defconfig | |
parent | 7d7bca889f99c4401931e536adb0da1b6c6f48c5 (diff) | |
parent | 0fe3ff4454c9ba2c9d6774ecafed799fe009d145 (diff) | |
download | blackbird-op-linux-28363d9357f0ad73644f613202880849ebba6acb.tar.gz blackbird-op-linux-28363d9357f0ad73644f613202880849ebba6acb.zip |
Merge tag 'samsung-defconfig-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig
Merge "Defconfig (exynos and multi_v7) changes for Exynos based boards for v4.7" from Krzysztof Kozłowski:
1. Enable additional drivers for Trats2 board (Exynos4412).
2. Enable CPUFreq governors as modules.
* tag 'samsung-defconfig-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: multi_v7_defconfig: Enable CPUFreq governors as modules
ARM: exynos_defconfig: Enable CPUFreq governors as modules
ARM: exynos_defconfig: Enable Trats2 audio codec, touchscreen and sensors
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 5f71b6cc9b61..6d5314864017 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -131,6 +131,10 @@ CONFIG_KEXEC=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=m CONFIG_QORIQ_CPUFREQ=y CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y |