From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 14 Sep 2016 21:59:33 +0000 (+0200)
Subject: Merge tag 'imx-defconfig-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawng... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b284ce537434f69d8d765f86867fab37c1cf54da;p=linux-beck.git

Merge tag 'imx-defconfig-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig

Merge "i.MX defconfig updates for 4.9" from Shawn Guo:
 - Enable i.MX6 SATA and cpufreq driver support in multi_v7_defconfig.
 - Enable MPL3115, Etnaviv GPU, WM8960 Codec driver and more USB
   functions support in imx_v6_v7_defconfig.

* tag 'imx-defconfig-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Select the wm8960 codec driver
  ARM: imx_v6_v7_defconfig: Add CONFIG_MPL3115
  ARM: imx_v6_v7_defconfig: Enable GPU support
  ARM: imx_v6_v7_defconfig: enable more USB configurations
  ARM: multi_v7_defconfig: Enable ARM_IMX6Q_CPUFREQ
  ARM: multi_v7_defconfig: Enable AHCI_IMX
---

b284ce537434f69d8d765f86867fab37c1cf54da
diff --cc arch/arm/configs/multi_v7_defconfig
index 27ef7860b11d,7db8dce3da5f..68264de8cae4
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -136,7 -135,8 +136,8 @@@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=
  CONFIG_CPU_FREQ_GOV_POWERSAVE=m
  CONFIG_CPU_FREQ_GOV_USERSPACE=m
  CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 -CONFIG_CPU_FREQ_GOV_SCHEDUTIL=m
 +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+ CONFIG_ARM_IMX6Q_CPUFREQ=y
  CONFIG_QORIQ_CPUFREQ=y
  CONFIG_CPU_IDLE=y
  CONFIG_ARM_CPUIDLE=y