From: Olof Johansson Date: Fri, 30 Nov 2018 23:51:29 +0000 (-0800) Subject: Merge tag 'omap-for-v4.21/defconfig-signed' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: v5.0-rc1~76^2~10 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/c9533792a5cb943487d15e37865da286fff142ad?hp=-c 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 --- c9533792a5cb943487d15e37865da286fff142ad diff --combined arch/arm/configs/multi_v7_defconfig index 63af6234c1b6,bd4ee0133710..d0763748b28a --- a/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