From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 Jul 2019 00:27:27 +0000 (-0700)
Subject: Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Tag: v5.4-rc1~494
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=abdfd52a295fb5731ab07b5c9013e2e39f4d1cbe;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'armsoc-defconfig' of git://git./linux/kernel/git/soc/soc

Pull ARM SoC defconfig updates from Olof Johansson:
 "We keep this in a separate branch to avoid cross-branch conflicts, but
  most of the material here is fairly boring -- some new drivers turned
  on for hardware since they were merged, and some refreshed files due
  to time having moved a lot of entries around"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (47 commits)
  ARM: configs: multi_v5: Remove duplicate ASPEED options
  arm64: defconfig: Enable CONFIG_KEYBOARD_SNVS_PWRKEY as module
  ARM: imx_v6_v7_defconfig: Enable CONFIG_ARM_IMX_CPUFREQ_DT
  defconfig: arm64: enable i.MX8 SCU octop driver
  arm64: defconfig: Add i.MX SCU SoC info driver
  arm64: defconfig: Enable CONFIG_QORIQ_THERMAL
  ARM: imx_v6_v7_defconfig: Select CONFIG_NVMEM_SNVS_LPGPR
  arm64: defconfig: ARM_IMX_CPUFREQ_DT=m
  ARM: imx_v6_v7_defconfig: Add TPM PWM support by default
  ARM: imx_v6_v7_defconfig: Enable the OV2680 camera driver
  ARM: imx_v6_v7_defconfig: Enable CONFIG_THERMAL_STATISTICS
  arm64: defconfig: NVMEM_IMX_OCOTP=y for imx8m
  ARM: multi_v7_defconfig: enable STMFX pinctrl support
  arm64 defconfig: enable LVM support
  ARM: configs: multi_v5: Add more ASPEED devices
  arm64: defconfig: Add Tegra194 PCIe driver
  ARM: configs: aspeed: Add new drivers
  ARM: exynos_defconfig: Enable Panfrost and Lima drivers
  ARM: multi_v7_defconfig: Enable Panfrost and Lima drivers
  arm64 defconfig: enable Mellanox cards
  ...
---

abdfd52a295fb5731ab07b5c9013e2e39f4d1cbe
diff --cc arch/arm/configs/exynos_defconfig
index 9b959af,f140532..2e6a863
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@@ -4,12 -5,7 +5,8 @@@ CONFIG_PREEMPT=
  CONFIG_CGROUPS=y
  CONFIG_BLK_DEV_INITRD=y
  CONFIG_PERF_EVENTS=y
- CONFIG_MODULES=y
- CONFIG_MODULE_UNLOAD=y
- CONFIG_PARTITION_ADVANCED=y
  CONFIG_ARCH_EXYNOS=y
- CONFIG_ARCH_EXYNOS3=y
 +CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y
  CONFIG_SMP=y
  CONFIG_BIG_LITTLE=y
  CONFIG_NR_CPUS=8
diff --cc arch/arm64/configs/defconfig
index ca2df23,1469523..0e58ef0
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -614,8 -647,8 +648,9 @@@ CONFIG_RTC_DRV_SNVS=
  CONFIG_RTC_DRV_IMX_SC=m
  CONFIG_RTC_DRV_XGENE=y
  CONFIG_DMADEVICES=y
 +CONFIG_FSL_EDMA=y
  CONFIG_DMA_BCM2835=m
+ CONFIG_DMA_SUN6I=m
  CONFIG_K3_DMA=y
  CONFIG_MV_XOR=y
  CONFIG_MV_XOR_V2=y