From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 24 Oct 2020 17:53:04 +0000 (-0700)
Subject: Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=45fe605832c8c0c962bfaf2581c6489b39abfe10;p=uclinux-h8%2Flinux.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: (33 commits)
  ARM: multi_v7_defconfig: add FMC2 EBI controller support
  arm64: defconfig: enable Qualcomm ASoC modules
  arm64: defconfig: qcom: enable GPU clock controller for SM8[12]50
  arm64: defconfig: enable INTERCONNECT for Qualcomm chipsets
  arm64: defconfig: enable the sl28cpld board management controller
  arm64: defconfig: Enable the eLCDIF and Raydium RM67191 drivers
  arm64: defconfig: Enable Qcom SNPS Femto PHY
  ARM: configs: Update Realview defconfig
  ARM: configs: Update Versatile defconfig
  ARM: config: aspeed_g5: Enable IBM OP Panel driver
  ARM: config: aspeed-g5: Enable I2C GPIO mux driver
  ARM: config: aspeed: Fix selection of media drivers
  arm64: defconfig: Enable Samsung S3FWRN5 NFC driver
  ARM: omap2plus_defconfig: enable generic net options
  ARM: omap2plus_defconfig: enable twl4030_madc as a loadable module
  arm64: defconfig: Enable clock driver for ROHM BD718x7 PMIC
  arm64: defconfig: Build ADMA and ACONNECT driver
  arm64: defconfig: Build AHUB component drivers
  arm64: defconfig: Enable Lontium LT9611 driver
  arm64: defcondfig: Enable USB ACM and FTDI drivers
  ...
---

45fe605832c8c0c962bfaf2581c6489b39abfe10
diff --cc arch/arm64/configs/defconfig
index 73c4783e1272,b458dcdf2050..17a2df6a263e
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -926,9 -949,9 +961,10 @@@ CONFIG_ARCH_TEGRA_194_SOC=
  CONFIG_ARCH_K3_AM6_SOC=y
  CONFIG_ARCH_K3_J721E_SOC=y
  CONFIG_TI_SCI_PM_DOMAINS=y
 +CONFIG_EXTCON_PTN5150=m
  CONFIG_EXTCON_USB_GPIO=y
  CONFIG_EXTCON_USBC_CROS_EC=y
+ CONFIG_RENESAS_RPCIF=m
  CONFIG_IIO=y
  CONFIG_EXYNOS_ADC=y
  CONFIG_MAX9611=m