From c1758ea6b671f9ed11c57b4eb474accf7a0cede5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 26 Jan 2014 16:27:35 +0000 Subject: [PATCH] Minor ARM config updates, Disable highbank cpuidle driver, Update CPU thermal scaling options for ARM --- config-arm-generic | 4 ++++ config-armv7-generic | 5 ++++- kernel.spec | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/config-arm-generic b/config-arm-generic index a0cf6e6f8..9c2270ca8 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -64,6 +64,7 @@ CONFIG_OF_PCI_IRQ=m CONFIG_OF_PCI=m # CONFIG_OF_SELFTEST is not set CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_THERMAL_OF=y # External Connectors CONFIG_EXTCON=m @@ -114,6 +115,9 @@ CONFIG_MFD_CORE=m CONFIG_SMC91X=m CONFIG_SMC911X=m +CONFIG_CPU_THERMAL=y +CONFIG_THERMAL_GOV_USER_SPACE=y + # CONFIG_CRYPTO_TEST is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set # CONFIG_XEN is not set diff --git a/config-armv7-generic b/config-armv7-generic index 27975c377..003b550ce 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -65,7 +65,7 @@ CONFIG_EDAC_HIGHBANK_MC=m CONFIG_EDAC_HIGHBANK_L2=m CONFIG_SATA_HIGHBANK=m CONFIG_ARM_HIGHBANK_CPUFREQ=m -CONFIG_ARM_HIGHBANK_CPUIDLE=y +# CONFIG_ARM_HIGHBANK_CPUIDLE is not set # errata # v5/v6 @@ -117,6 +117,8 @@ CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_LSM_MMAP_MIN_ADDR=32768 +CONFIG_ARM_GLOBAL_TIMER=y + CONFIG_XZ_DEC_ARM=y # Power management @@ -253,6 +255,7 @@ CONFIG_GPIO_GENERIC_PLATFORM=m CONFIG_GPIO_ADNP=m CONFIG_GPIO_MCP23S08=m CONFIG_SERIAL_8250_EM=m +CONFIG_INPUT_GPIO=m CONFIG_INPUT_GPIO_TILT_POLLED=m CONFIG_MDIO_BUS_MUX_GPIO=m CONFIG_MDIO_BUS_MUX_MMIOREG=m diff --git a/kernel.spec b/kernel.spec index 1294874b1..cb541c64e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2264,6 +2264,10 @@ fi # ||----w | # || || %changelog +* Sun Jan 26 2014 Peter Robinson +- Minor ARM config updates +- Disable highbank cpuidle driver +- Update CPU thermal scaling options for ARM * Wed Jan 15 2014 Justin M. Forbes