Merge tag 'imx-defconfig-4.10' of git://git.kernel.org/pub/scm/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 <[email protected]>
zuai · Nov 18, 2016 · 43d461f · 43d461f
2 parents 672806a + 3252e25
commit 43d461f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
@@ -86,6 +86,7 @@ CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 CONFIG_DMA_CMA=y
+CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_IMX_WEIM=y
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
@@ -256,6 +257,7 @@ CONFIG_SND_IMX_SOC=y
 CONFIG_SND_SOC_PHYCORE_AC97=y
 CONFIG_SND_SOC_EUKREA_TLV320=y
 CONFIG_SND_SOC_IMX_WM8962=y
+CONFIG_SND_SOC_IMX_ES8328=y
 CONFIG_SND_SOC_IMX_SGTL5000=y
 CONFIG_SND_SOC_IMX_SPDIF=y
 CONFIG_SND_SOC_IMX_MC13783=y