From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Apr 2020 22:15:10 +0000 (-0700)
Subject: Merge tag 'arm-defconfig-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Tag: v5.15~4152
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b48c8f132e0c30220ce509f72dd90da05245524;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull ARM defconfig updates from Arnd Bergmann:
 "As usual, tons of new drivers and other options got merged and are now
  enabled in the defconfig files, usually as loadable modules"

* tag 'arm-defconfig-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (45 commits)
  ARM: omap2plus_defconfig: Update for moved and dropped options
  ARM: omap2plus_defconfig: Enable ina2xx_adc as a loadable module
  ARM: omap2plus_defconfig: Enable McPDM optional PMIC clock as modules
  ARM: omap2plus_defconfig: Enable more droid4 devices as loadable modules
  ARM: omap2plus_defconfig: Enable zram as loadable modules
  ARM: omap2plus_defconfig: Enable simple-pm-bus
  arm64: defconfig: Enable Qualcomm SDM845 audio configs
  arm64: defconfig: Enable e1000 device
  arm64: defconfig: Enable PHY devices used on QorIQ boards
  arm64: defconfig: Enable RTC devices for QorIQ boards
  arm64: defconfig: Enable flash device drivers for QorIQ boards
  arm64: defconfig: Enable ARM Mali display driver
  arm64: defconfig: Enable QorIQ GPIO driver
  arm64: defconfig: Enable QorIQ IFC NAND controller driver
  arm64: defconfig: Enable ARM SBSA watchdog driver
  arm64: defconfig: Enable QorIQ cpufreq driver
  arm64: defconfig: Enable NXP/FSL SPI controller drivers
  arm64: defconfig: Enable ENETC Ethernet controller and FELIX switch
  arm64: defconfig: Enable QorIQ DPAA2 drivers
  arm64: defconfig: Enable QorIQ DPAA1 drivers
  ...
---

9b48c8f132e0c30220ce509f72dd90da05245524
diff --cc arch/arm/configs/omap2plus_defconfig
index 15cb35b,5a4134a..3cc3ca5
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -365,6 -368,7 +366,10 @@@ CONFIG_DRM_PANEL_SHARP_LS037V7DW01=
  CONFIG_DRM_PANEL_SONY_ACX565AKM=m
  CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
  CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
++CONFIG_DRM_DISPLAY_CONNECTOR=m
++CONFIG_DRM_SIMPLE_BRIDGE=m
+ CONFIG_DRM_TI_TFP410=m
++CONFIG_DRM_TI_TPD12S015=m
  CONFIG_FB=y
  CONFIG_FIRMWARE_EDID=y
  CONFIG_FB_MODE_HELPERS=y
diff --cc arch/arm64/configs/defconfig
index a6c0d02,be19c4e..24e534d
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -284,8 -310,9 +311,10 @@@ CONFIG_SMSC911X=
  CONFIG_SNI_AVE=y
  CONFIG_SNI_NETSEC=y
  CONFIG_STMMAC_ETH=m
 +CONFIG_TI_K3_AM65_CPSW_NUSS=y
  CONFIG_MDIO_BUS_MUX_MMIOREG=y
+ CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
+ CONFIG_AQUANTIA_PHY=y
  CONFIG_MARVELL_PHY=m
  CONFIG_MARVELL_10G_PHY=m
  CONFIG_MESON_GXL_PHY=m