From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 29 May 2015 12:49:54 +0000 (+0200)
Subject: Merge tag 'qcom-defconfig-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~1554^2~11
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ceb798ace01e3f269650c71f645d1527127f9610;p=firefly-linux-kernel-4.4.55.git

Merge tag 'qcom-defconfig-for-4.2' of git://git./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
---

ceb798ace01e3f269650c71f645d1527127f9610
diff --cc arch/arm/configs/multi_v7_defconfig
index 3c0e23adc5eb,d11e4050334a..ff2126dc7eda
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -120,10 -112,9 +120,11 @@@ CONFIG_CPU_FREQ=
  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
 +CONFIG_ARM_EXYNOS_CPUIDLE=y
  CONFIG_NET=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
@@@ -590,13 -535,9 +591,14 @@@ CONFIG_SERIO_NVEC_PS2=
  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
  CONFIG_COMMON_CLK_MAX77686=y
 +CONFIG_COMMON_CLK_MAX77802=m
 +CONFIG_COMMON_CLK_S2MPS11=m
 +CONFIG_COMMON_CLK_QCOM=y
  CONFIG_APQ_MMCC_8084=y
  CONFIG_MSM_GCC_8660=y
  CONFIG_MSM_MMCC_8960=y