diff options
| -rw-r--r-- | config-arm-generic | 5 | ||||
| -rw-r--r-- | config-armv7 | 5 | ||||
| -rw-r--r-- | config-armv7-generic | 4 | ||||
| -rw-r--r-- | kernel.spec | 1 |
4 files changed, 7 insertions, 8 deletions
diff --git a/config-arm-generic b/config-arm-generic index e2fdcb571..5de3e76a1 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -81,11 +81,6 @@ CONFIG_POWER_RESET_VERSATILE=y # CONFIG_ARM_CPUIDLE is not set # CONFIG_ARM_DT_BL_CPUFREQ is not set # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set -CONFIG_CPU_IDLE=y -# CONFIG_CPU_IDLE_GOV_LADDER is not set -CONFIG_CPU_IDLE_GOV_MENU=y -# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set - # Device tree CONFIG_DTC=y diff --git a/config-armv7 b/config-armv7 index 32fc8973e..6b355bd88 100644 --- a/config-armv7 +++ b/config-armv7 @@ -259,6 +259,7 @@ CONFIG_TI_AM335X_ADC=m CONFIG_PWM_TIPWMSS=y CONFIG_MFD_TPS65218=m CONFIG_REGULATOR_TPS65218=m +CONFIG_INPUT_TPS65218_PWRBUTTON=m CONFIG_VIDEO_AM437X_VPFE=m # QCom @@ -311,6 +312,7 @@ CONFIG_MFD_PM8XXX=m CONFIG_KEYBOARD_PMIC8XXX=m CONFIG_INPUT_PM8XXX_VIBRATOR=m CONFIG_INPUT_PMIC8XXX_PWRKEY=m +CONFIG_INPUT_PM8941_PWRKEY=m CONFIG_RTC_DRV_PM8XXX=m # CONFIG_DRM_MSM_REGISTER_LOGGING is not set CONFIG_QCOM_WDT=m @@ -319,7 +321,6 @@ CONFIG_SPMI=m CONFIG_SPMI_MSM_PMIC_ARB=m CONFIG_QCOM_SPMI_IADC=m CONFIG_QCOM_SPMI_VADC=m -CONFIG_INPUT_PM8941_PWRKEY=m CONFIG_LEDS_PM8941_WLED=m CONFIG_SND_SOC_QCOM=m CONFIG_SND_SOC_LPASS_CPU=m @@ -567,7 +568,7 @@ CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y CONFIG_COMMON_CLK_AXI_CLKGEN=m CONFIG_COMMON_CLK_SI570=m CONFIG_COMMON_CLK_XLNX_CLKWZRD=m -CONFIG_ARM_ZYNQ_CPUIDLE=y +# CONFIG_ARM_ZYNQ_CPUIDLE is not set CONFIG_LATTICE_ECP3_CONFIG=m CONFIG_NET_VENDOR_XILINX=y CONFIG_XILINX_EMACLITE=m diff --git a/config-armv7-generic b/config-armv7-generic index 7f1651123..77889b979 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -125,6 +125,7 @@ CONFIG_CLOCK_THERMAL=y CONFIG_CPUFREQ_DT=y # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set CONFIG_PM_DEVFREQ=y +CONFIG_PM_DEVFREQ_EVENT=y CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y CONFIG_DEVFREQ_GOV_PERFORMANCE=y CONFIG_DEVFREQ_GOV_POWERSAVE=y @@ -226,10 +227,11 @@ CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_ARM_EXYNOS5250_CPUFREQ=y CONFIG_ARM_EXYNOS5440_CPUFREQ=y CONFIG_ARM_EXYNOS_CPU_FREQ_BOOST_SW=y -CONFIG_ARM_EXYNOS_CPUIDLE=y +# CONFIG_ARM_EXYNOS_CPUIDLE is not set CONFIG_ARM_EXYNOS5_BUS_DEVFREQ=m # CONFIG_EXYNOS5420_MCPM not set CONFIG_ARM_EXYNOS_CPUFREQ=m +CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y CONFIG_I2C_EXYNOS5=m CONFIG_I2C_S3C2410=m diff --git a/kernel.spec b/kernel.spec index 0af46f74a..fc5f02814 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2203,6 +2203,7 @@ fi %changelog * Sun May 3 2015 Peter Robinson <pbrobinson@fedoraproject.org> - Enable ACPI on aarch64 +- General ARMv7 updates * Fri May 01 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc1.git1.1 - Linux v4.1-rc1-117-g4a152c3913fb |