Merge tag 'omap-for-v4.21/defconfig-signed' of...

Merge tag 'omap-for-v4.21/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig

Defconfig changes for omaps for v4.21 merge window

We're finally changing omaps to use 8250_OMAP instead of SERIAL_OMAP
for multi_v7_defconfig. This will make things much easier for distros,
and the kernel already warns about the kernel console getting
redirected with CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP defaulting to y.

People using /etc/inittab still need to s/ttyO/ttyS/ if using the
out-of-box multi_v7_defconfig, and that did not seem to be an issue
when we moved omap2plus_defconfig to use 8250_OMAP earlier.

The other change is to enable CONFIG_SND_SOC_TLV320AIC23_I2C as a
loadable module that I forgot to send a pull request for earlier.

* tag 'omap-for-v4.21/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: multi_v7_defconfig: Enable 8250-omap serial driver and use it by default
  ARM: omap2plus_defconfig: Add tlv320aic23 as module
Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/configs/multi_v7_defconfig

@@ -304,6 +304,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_8250_BCM2835AUX=y
 CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_8250_EM=y
+CONFIG_SERIAL_8250_OMAP=y
 CONFIG_SERIAL_8250_MT6577=y
 CONFIG_SERIAL_8250_UNIPHIER=y
 CONFIG_SERIAL_OF_PLATFORM=y

arch/arm/configs/omap2plus_defconfig

@@ -389,6 +389,7 @@ CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
 CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
 CONFIG_SND_SOC_CPCAP=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
 CONFIG_HID_GENERIC=m