openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAlwAQ88RHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXN88xAAsGNc0MWOIFSMdOVjziEQjG6xmpwZcn3M
 O8Z+Qg2V7DCSxrufM4vWIBo9Bt3AxMO2tv8S6YyrSmJ0rAc1KZUKWsB8wOuQTSY3
 6yG1x+HxDKRZaj2RFO0o4vbDgEMqcDG5osQDBSj+EYMheg8ieQLdO6tGULXUh12D
 897UzSfi0FGCjp6ytfNdaN1f254NFROevLm17Ab3ZrN91D8bCFgnX5csiNFsaJWG
 uFnGdk+hAs0GyuUzeC8osqJ2HxNY+4zLZENbYhwzSpfnLgCiNFUgz+LDinjtOWm/
 MqKxt2NC/6J1ZWdgSOST/osxfuaytXaLM5zCaTYoOzplIJYJ5uB5X5vteevbSmw1
 rvS3XV5cca9Lwpjxs82S4Tf0Q0t1l+vI4wRGQ6MmSs4up3C8WwYKyYvIxjzEKE78
 ztx8KfWyPCau87il2P6M4SjrClmF9lh0RxYdq5C3sFplgm5s6wZdgAkED+JkZYaF
 Avd1cmzS/eDWbC9wsDY0opONm16Tx220hts2PrWXdF7VZJBpZMjQImpvGeLEHZ1h
 mf9AuAOaQT1z43LthwKzF5Z8vD28kHIv5KfvePN7NFiQz+p1ZmtOqDFAKoPu6a8b
 uPYSTeyHWay6cwHBfzA2eCTAtA1mBe9YXfv+viTMGzbYQ+qabKm8E+E9s70WanZy
 ktZg8UyjF8s=
 =rfKY
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2018-11-30 15:51:29 -08:00
parent 4737365aeb f98d45145e
commit c9533792a5
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/configs/multi_v7_defconfig
View File

@ -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

1
arch/arm/configs/omap2plus_defconfig
View File

@ -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