summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-01-13 09:14:01 +0000
committerPeter Robinson <pbrobinson@gmail.com>2014-01-13 09:14:01 +0000
commit4f47a2c54c68b5fd10a2c469abfa34b050849dda (patch)
treec18501d896b1a3830d80d78f41f75cfd4bc8e74a
parent39549c0eb37a4c221592b6359d2a5663b13978b7 (diff)
downloadkernel-4f47a2c54c68b5fd10a2c469abfa34b050849dda.tar.gz
kernel-4f47a2c54c68b5fd10a2c469abfa34b050849dda.tar.xz
kernel-4f47a2c54c68b5fd10a2c469abfa34b050849dda.zip
Enable generic cpufreq-cpu0 driver on ARM
-rw-r--r--config-armv71
-rw-r--r--config-armv7-generic3
-rw-r--r--config-armv7-lpae1
-rw-r--r--kernel.spec1
4 files changed, 4 insertions, 2 deletions
diff --git a/config-armv7 b/config-armv7
index c57957c9a..5855b052a 100644
--- a/config-armv7
+++ b/config-armv7
@@ -624,7 +624,6 @@ CONFIG_REGULATOR_MAX8973=m
# CONFIG_BATTERY_RX51 is not set
# CONFIG_IR_RX51 is not set
-# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_LP8788 is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index 95723b34c..a11d454c2 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -120,7 +120,10 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768
CONFIG_XZ_DEC_ARM=y
+# Power management
+CONFIG_PM_OPP=y
CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_GENERIC_CPUFREQ_CPU0=m
CONFIG_LOCAL_TIMERS=y
CONFIG_UACCESS_WITH_MEMCPY=y
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 21ef6b2ba..c3b22bcdf 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -69,7 +69,6 @@ CONFIG_SOC_EXYNOS5440=y
# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
# CONFIG_ARM_EXYNOS5440_CPUFREQ is not set
# CONFIG_ARM_EXYNOS_CPUFREQ is not set
-# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
CONFIG_EXYNOS_THERMAL=m
CONFIG_PCI_EXYNOS=y
diff --git a/kernel.spec b/kernel.spec
index b5ff354db..ed4e98a8e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2169,6 +2169,7 @@ fi
%changelog
* Sun Jan 12 2014 Peter Robinson <pbrobinson@fedoraproject.org>
- Minor ARM config updates and cleanups
+- Enable generic cpufreq-cpu0 driver on ARM
* Sun Jan 12 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc8.git0.1
- Linux v3.13-rc8