diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-29 14:49:54 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-29 14:49:54 +0200 |
| commit | ceb798ace01e3f269650c71f645d1527127f9610 (patch) | |
| tree | 3ee6bc994c984f365aba51acc37f2d4280dd4f0f /arch/arm/configs | |
| parent | 9482317340ce75f9c0030b8fe2188b6b330064e3 (diff) | |
| parent | e3db12b94ed4e70b7f8703a0c7396d6b9028b58a (diff) | |
Merge tag 'qcom-defconfig-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/defconfig
Merge "Qualcomm ARM Based defconfig Updates for v4.2" from Kumar Gala:
* Enable cpuidle for QCOM SoCs in qcom & multi_v7_defconfig
* tag 'qcom-defconfig-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
ARM: config: multi_v7: Update to enable cpuidle for QCOM SoCs
ARM: config: Update qcom_defconfig to enable cpuidle
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/qcom_defconfig | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 3c0e23adc5eb..ff2126dc7eda 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -120,6 +120,7 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_IDLE=y +CONFIG_ARM_CPUIDLE=y CONFIG_NEON=y CONFIG_KERNEL_MODE_NEON=y CONFIG_ARM_ZYNQ_CPUIDLE=y @@ -590,6 +591,7 @@ CONFIG_SERIO_NVEC_PS2=y CONFIG_NVEC_POWER=y CONFIG_NVEC_PAZ00=y CONFIG_QCOM_GSBI=y +CONFIG_QCOM_PM=y CONFIG_COMMON_CLK_QCOM=y CONFIG_CHROME_PLATFORMS=y CONFIG_CROS_EC_CHARDEV=m diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig index d2f2babfd47a..e6a6f282e3de 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -30,6 +30,7 @@ CONFIG_CLEANCACHE=y CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_CPU_IDLE=y +CONFIG_ARM_CPUIDLE=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set @@ -143,6 +144,7 @@ CONFIG_MSM_MMCC_8960=y CONFIG_MSM_MMCC_8974=y CONFIG_MSM_IOMMU=y CONFIG_QCOM_GSBI=y +CONFIG_QCOM_PM=y CONFIG_PHY_QCOM_APQ8064_SATA=y CONFIG_PHY_QCOM_IPQ806X_SATA=y CONFIG_EXT2_FS=y |