From: Olof Johansson Date: Mon, 21 Oct 2019 21:48:51 +0000 (-0700) Subject: Merge tag 'samsung-defconfig-5.5' of https://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v5.15~4956^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=683554e563fd5eadcbfb086e8756510251cea4cd;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'samsung-defconfig-5.5' of https://git./linux/kernel/git/krzk/linux into arm/defconfig 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 --- 683554e563fd5eadcbfb086e8756510251cea4cd diff --cc arch/arm/configs/multi_v7_defconfig index e4c8def,9711c61..e039680 --- a/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_EXYNOS_IOMMU=y -CONFIG_REMOTEPROC=m +CONFIG_REMOTEPROC=y CONFIG_ST_REMOTEPROC=m CONFIG_RPMSG_VIRTIO=m CONFIG_ASPEED_LPC_CTRL=m