Merge tag 'samsung-defconfig-5.5' of https://git.kernel.org/pub/scm/linux/kernel...

Samsung defconfig changes for v5.5

1. Enable Dynamic Memory Controller driver for Exynos5422,
2. Enable Arndale (Exynos5250) audio driver,
3. Sync multi_v7 defconfig with exynos by enabling useful and necessary
   drivers (NFC, watchdog, S2MPA01 regulator, IOMMU, Maxim extcon
   drivers, PHY for SATA and devfreq).

* tag 'samsung-defconfig-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: multi_v7_defconfig: Enable Exynos bus and memory frequency scaling (devfreq)
  ARM: multi_v7_defconfig: Enable options for boards with Exynos SoC
  ARM: exynos_defconfig: Enable Arndale audio driver
  ARM: exynos_defconfig: Enable DMC driver

Link: https://lore.kernel.org/r/20191021180453.29455-2-krzk@kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/configs/multi_v7_defconfig
index e4c8def9a0a578d75e93e370b153cfe70414b983,9711c61bd76e5ce8a8ebeea3fba10e6a14e98158..e039680d3c723f24f1ca3d361a23989cc011080a
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -933,7 -943,8 +943,8 @@@ CONFIG_BCM2835_MBOX=
  CONFIG_ROCKCHIP_IOMMU=y
  CONFIG_TEGRA_IOMMU_GART=y
  CONFIG_TEGRA_IOMMU_SMMU=y
 -CONFIG_REMOTEPROC=m
+ CONFIG_EXYNOS_IOMMU=y
 +CONFIG_REMOTEPROC=y
  CONFIG_ST_REMOTEPROC=m
  CONFIG_RPMSG_VIRTIO=m
  CONFIG_ASPEED_LPC_CTRL=m