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

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 <[email protected]>

diff --combined arch/arm/configs/multi_v7_defconfig
index 63af6234c1b69a20b763470a8a73a989e1d7f747,bd4ee0133710f448c85f5382afa57e6dda5bd19d..d0763748b28aa13d69d449cd2fa6b32ae964900e
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -1,6 -1,7 +1,6 @@@
  CONFIG_SYSVIPC=y
  CONFIG_NO_HZ=y
  CONFIG_HIGH_RES_TIMERS=y
 -CONFIG_PREEMPT=y
  CONFIG_CGROUPS=y
  CONFIG_BLK_DEV_INITRD=y
  CONFIG_EMBEDDED=y
@@@ -304,6 -305,7 +304,7 @@@ CONFIG_SERIAL_8250_SHARE_IRQ=
  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