Merge tag 'imx-defconfig-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn...
authorOlof Johansson <olof@lixom.net>
Fri, 18 Nov 2016 18:32:48 +0000 (10:32 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 18 Nov 2016 18:32:48 +0000 (10:32 -0800)
commit43d461f16ca0d6a568ed917afb167cc8a0f393dd
treea4f2a084bb8013d7ac9a35e683cf1f2af5819850
parent672806a5f168696164b3cc4f204eeb2c14b7d822
parent3252e255371ad22c02d5c9d1740d408ce1b10f35
Merge tag 'imx-defconfig-4.10' of git://git./linux/kernel/git/shawnguo/linux into next/defconfig

i.MX defconfig updates for 4.10:
 - Increase CMA size to 64 MiB, so that we can use etnaviv driver with
   1920x1080 display devices.
 - Enable ES8328 codec driver support, which is required by Kosagi
   Novena boards.

* tag 'imx-defconfig-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Select the es8328 codec driver
  ARM: imx_v6_v7_defconfig: Increase CMA size

Signed-off-by: Olof Johansson <olof@lixom.net>