Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

Pull ARM SoC defconfig updates from Olof Johansson:
 "Most changes here are to enable new drivers and platforms in the
  various configs that affect them. Most of these have been covered and
  described in the other branches, we mostly keep defconfig separate to
  avoid conflicts between SoC/dt/driver updates that they otherwise
  would be grouped with.

  One thing worth mentioning here is that OMAP changes from using their
  own UART driver, to 8250, for the multi_v7_defconfig shared config on
  32-bit. This means that the console is now named ttyS* instead of
  ttyO*. This change was already done for omap2_defconfig a while back,
  so most users of these configs have either already updated, or can
  easily follow the same patterns as they did at that time. This makes
  platform support slightly easier for distros, since they no longer
  need to keep track of a separate console prefix for these platforms"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
  Revert "arm64: defconfig: Enable FSL_MC_BUS and FSL_MC_DPIO"
  arm64: defconfig: Enable FSL_MC_BUS and FSL_MC_DPIO
  arm64: defconfig: Replace PINCTRL_MT7622 with PINCTRL_MTK_MOORE
  arm64: defconfig: Regenerate for v4.20
  ARM: multi_v7_defconfig: Add TOSHIBA TC358764 bridge driver
  ARM: multi_v7_defconfig: Add MAX8952 regulator driver
  ARM: exynos_defconfig: Add TOSHIBA TC358764 bridge driver
  ARM: exynos_defconfig: Add MAX8952 regulator driver
  ARM: exynos_defconfig: Add MAX8998 RTC and charger drivers
  ARM: imx_v6_v7_defconfig: add imx7ulp support
  ARM: imx_v6_v7_defconfig: Select TOUCHSCREEN_GOODIX
  ARM: multi_v7_defconfig: enable STM32 analog & timer drivers
  arm64: defconfig: Enable GCC and PINCTRL for MSM8998
  arm64: defconfig: Enable core Qualcomm SDM845 options
  ARM: defconfig: Enable the PL111 DRM driver on vexpress
  ARM: defconfig: Update the vexpress defconfig
  arm64: defconfig: Enable some qcom remoteproc configs
  arm64: defconfig: Enable QCS404 configs
  ARM: imx_v6_v7_defconfig: Enable USB_ANNOUNCE_NEW_DEVICES
  ARM: imx_v6_v7_defconfig: Enable BT_BNEP
  ...

diff --cc arch/arm/configs/omap2plus_defconfig
index 2274e45,21cabb7..9c6f436
--- 1/arch/arm/configs/omap2plus_defconfig
--- 2/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -381,14 -381,15 +381,15 @@@ CONFIG_SND_VERBOSE_PRINTK=
  CONFIG_SND_DEBUG=y
  CONFIG_SND_USB_AUDIO=m
  CONFIG_SND_SOC=m
 -CONFIG_SND_EDMA_SOC=m
 -CONFIG_SND_AM33XX_SOC_EVM=m
 -CONFIG_SND_OMAP_SOC=m
 -CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m
 -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_TLV320AIC3X=m
 +CONFIG_SND_SOC_DAVINCI_MCASP=m
 +CONFIG_SND_SOC_NOKIA_RX51=m
 +CONFIG_SND_SOC_OMAP_HDMI=m
 +CONFIG_SND_SOC_OMAP_ABE_TWL6040=m
 +CONFIG_SND_SOC_OMAP3_PANDORA=m
 +CONFIG_SND_SOC_OMAP3_TWL4030=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