diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 23:59:33 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 23:59:33 +0200 |
commit | b284ce537434f69d8d765f86867fab37c1cf54da (patch) | |
tree | 7438384e79008092cdea7fc0e7576c00ccd2647a /Documentation/devicetree/bindings/pinctrl | |
parent | 3197f7dc2350fc034d9790b753f20c7908bf9adc (diff) | |
parent | b2ab6f6cc3b1da42acf30e03ce2a4dad3f627272 (diff) |
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
Diffstat (limited to 'Documentation/devicetree/bindings/pinctrl')
0 files changed, 0 insertions, 0 deletions