Skip to content
Commit 93be39bf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-defconfig-4.17' of...

Merge tag 'imx-defconfig-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc

Pull "i.MX defconfig updates for 4.17" from Shawn Guo:

 - Re-sync defconfig files by running savedefconfig.
 - Enable generic fsl-asoc-card driver for imx_v4_v5_defconfig.
 - Enable MAG3110 magnetometer sensor driver, AC97 and WM8962 codec
   driver, DA9062/63 PMIC, RTC and Watchdog support for
   imx_v6_v7_defconfig.

* tag 'imx-defconfig-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: mxs_defconfig: Re-sync defconfig
  ARM: imx_v4_v5_defconfig: Use the generic fsl-asoc-card driver
  ARM: imx_v4_v5_defconfig: Re-sync defconfig
  ARM: imx_v6_v7_defconfig: Select CONFIG_SND_SOC_WM8962 explicitly
  ARM: imx_v6_v7_defconfig: Re-sync defconfig
  ARM: imx_v6_v7_defconfig: Enable Dialog Semiconductor DA9062 driver
  ARM: imx_v6_v7_defconfig: Enable AC97 codec support
  ARM: imx: Update imx_v6_v7_defconfig for mag3110 support
  ARM: imx_v6_v7_defconfig: enable OP-TEE
  ARM: imx_v6_v7_defconfig: select the CONFIG_CPUFREQ_DT
parents 18b6843f 8bc2c29b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment