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

ASPEED device tree updates for 5.5

This adds recently merged drivers to the aspeed g4 and g5 defconfigs,
and to the multi v5 and v7 shared defconfigs.

* tag 'aspeed-5.5-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: config: multi_v5: ASPEED SDHCI, SGPIO
  ARM: configs: multi_v7: ASPEED network, gpio, FSI
  ARM: config: aspeed-g4: Add MMC, and cleanup
  ARM: config: aspeed-g5: Add SGPIO and FSI drivers
  ARM: config: aspeed-g5: Enable 8250_DW quirks

Link: https://lore.kernel.org/r/CACPK8Xc3a=6irkTSfwyPrr=nWv_fa9nMxthtC2AyqFJEWvuMwg@mail.gmail.com
Signed-off-by: Olof Johansson <[email protected]>

diff --combined arch/arm/configs/multi_v7_defconfig
index 86b37af389522ab583da59b43ca0f0091ffc831c,124f50dc9cc75383f218c9c32961f0b89c7a678b..24962d0e71c79b1427e077f637d8e599e511d695
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -53,9 -53,6 +53,9 @@@ CONFIG_ARCH_MEDIATEK=
  CONFIG_ARCH_MESON=y
  CONFIG_ARCH_MILBEAUT=y
  CONFIG_ARCH_MILBEAUT_M10V=y
 +CONFIG_ARCH_MMP=y
 +CONFIG_MACH_MMP2_DT=y
 +CONFIG_MACH_MMP3_DT=y
  CONFIG_ARCH_MVEBU=y
  CONFIG_MACH_ARMADA_370=y
  CONFIG_MACH_ARMADA_375=y
@@@ -171,14 -168,6 +171,14 @@@ CONFIG_MAC80211=
  CONFIG_RFKILL=y
  CONFIG_RFKILL_INPUT=y
  CONFIG_RFKILL_GPIO=y
 +CONFIG_NFC=m
 +CONFIG_NFC_DIGITAL=m
 +CONFIG_NFC_NCI=m
 +CONFIG_NFC_NCI_SPI=m
 +CONFIG_NFC_NCI_UART=m
 +CONFIG_NFC_HCI=m
 +CONFIG_NFC_SHDLC=y
 +CONFIG_NFC_S3FWRN5_I2C=m
  CONFIG_PCIEPORTBUS=y
  CONFIG_PCI_MVEBU=y
  CONFIG_PCI_TEGRA=y
@@@ -255,6 -244,7 +255,7 @@@ CONFIG_BGMAC_BCMA=
  CONFIG_SYSTEMPORT=m
  CONFIG_MACB=y
  CONFIG_NET_CALXEDA_XGMAC=y
+ CONFIG_FTGMAC100=m
  CONFIG_GIANFAR=y
  CONFIG_HIX5HD2_GMAC=y
  CONFIG_E1000E=y
@@@ -294,7 -284,6 +295,7 @@@ CONFIG_INPUT_EVDEV=
  CONFIG_KEYBOARD_QT1070=m
  CONFIG_KEYBOARD_GPIO=y
  CONFIG_KEYBOARD_TEGRA=y
 +CONFIG_KEYBOARD_PXA27x=m
  CONFIG_KEYBOARD_SAMSUNG=m
  CONFIG_KEYBOARD_ST_KEYSCAN=y
  CONFIG_KEYBOARD_SPEAR=y
@@@ -427,7 -416,7 +428,7 @@@ CONFIG_SPI_SH_MSIOF=
  CONFIG_SPI_SH_HSPI=y
  CONFIG_SPI_SIRF=y
  CONFIG_SPI_STM32=m
 -CONFIG_SPI_STM32_QSPI=m
 +CONFIG_SPI_STM32_QSPI=y
  CONFIG_SPI_SUN4I=y
  CONFIG_SPI_SUN6I=y
  CONFIG_SPI_TEGRA114=y
@@@ -449,6 -438,7 +450,7 @@@ CONFIG_PINCTRL_MSM8X74=
  CONFIG_PINCTRL_MSM8916=y
  CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
  CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
+ CONFIG_GPIO_ASPEED_SGPIO=y
  CONFIG_GPIO_DAVINCI=y
  CONFIG_GPIO_DWAPB=y
  CONFIG_GPIO_EM=y
@@@ -503,12 -493,12 +505,12 @@@ CONFIG_BCM2835_THERMAL=
  CONFIG_BRCMSTB_THERMAL=m
  CONFIG_ST_THERMAL_MEMMAP=y
  CONFIG_UNIPHIER_THERMAL=y
 -CONFIG_WATCHDOG=y
  CONFIG_DA9063_WATCHDOG=m
  CONFIG_XILINX_WATCHDOG=y
  CONFIG_ARM_SP805_WATCHDOG=y
  CONFIG_AT91SAM9X_WATCHDOG=y
  CONFIG_SAMA5D4_WATCHDOG=y
 +CONFIG_S3C2410_WATCHDOG=m
  CONFIG_DW_WATCHDOG=y
  CONFIG_DAVINCI_WATCHDOG=m
  CONFIG_ORION_WATCHDOG=y
@@@ -593,7 -583,6 +595,7 @@@ CONFIG_REGULATOR_QCOM_RPM=
  CONFIG_REGULATOR_QCOM_SMD_RPM=m
  CONFIG_REGULATOR_RK808=y
  CONFIG_REGULATOR_RN5T618=y
 +CONFIG_REGULATOR_S2MPA01=m
  CONFIG_REGULATOR_S2MPS11=y
  CONFIG_REGULATOR_S5M8767=y
  CONFIG_REGULATOR_STM32_BOOSTER=m
@@@ -618,7 -607,6 +620,7 @@@ CONFIG_VIDEO_V4L2_SUBDEV_API=
  CONFIG_MEDIA_USB_SUPPORT=y
  CONFIG_USB_VIDEO_CLASS=m
  CONFIG_V4L_PLATFORM_DRIVERS=y
 +CONFIG_VIDEO_MMP_CAMERA=m
  CONFIG_VIDEO_ASPEED=m
  CONFIG_VIDEO_STM32_DCMI=m
  CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
@@@ -716,9 -704,6 +718,9 @@@ CONFIG_SND_ATMEL_SOC_PDMIC=
  CONFIG_SND_ATMEL_SOC_I2S=m
  CONFIG_SND_BCM2835_SOC_I2S=m
  CONFIG_SND_SOC_FSL_SAI=m
 +CONFIG_SND_MMP_SOC=y
 +CONFIG_SND_PXA_SOC_SSP=m
 +CONFIG_SND_PXA910_SOC=m
  CONFIG_SND_SOC_ROCKCHIP=m
  CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
  CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
@@@ -728,12 -713,9 +730,12 @@@ CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=
  CONFIG_SND_SOC_SMDK_WM8994_PCM=m
  CONFIG_SND_SOC_SNOW=m
  CONFIG_SND_SOC_ODROID=m
 +CONFIG_SND_SOC_ARNDALE=m
  CONFIG_SND_SOC_SH4_FSI=m
  CONFIG_SND_SOC_RCAR=m
  CONFIG_SND_SOC_STI=m
 +CONFIG_SND_SOC_STM32_SAI=m
 +CONFIG_SND_SOC_STM32_I2S=m
  CONFIG_SND_SUN4I_CODEC=m
  CONFIG_SND_SOC_TEGRA=m
  CONFIG_SND_SOC_TEGRA20_I2S=m
@@@ -747,12 -729,10 +749,12 @@@ CONFIG_SND_SOC_TEGRA_ALC5632=
  CONFIG_SND_SOC_TEGRA_MAX98090=m
  CONFIG_SND_SOC_AK4642=m
  CONFIG_SND_SOC_CPCAP=m
 +CONFIG_SND_SOC_CS42L51_I2C=m
  CONFIG_SND_SOC_SGTL5000=m
  CONFIG_SND_SOC_SPDIF=m
  CONFIG_SND_SOC_STI_SAS=m
  CONFIG_SND_SOC_WM8978=m
 +CONFIG_SND_AUDIO_GRAPH_CARD=m
  CONFIG_USB=y
  CONFIG_USB_OTG=y
  CONFIG_USB_XHCI_HCD=y
@@@ -762,7 -742,6 +764,7 @@@ CONFIG_USB_EHCI_HCD=
  CONFIG_USB_EHCI_HCD_STI=y
  CONFIG_USB_EHCI_TEGRA=y
  CONFIG_USB_EHCI_EXYNOS=y
 +CONFIG_USB_EHCI_MV=m
  CONFIG_USB_OHCI_HCD=y
  CONFIG_USB_OHCI_HCD_STI=y
  CONFIG_USB_OHCI_EXYNOS=m
@@@ -833,7 -812,6 +835,7 @@@ CONFIG_MMC_SDHCI_DOVE=
  CONFIG_MMC_SDHCI_TEGRA=y
  CONFIG_MMC_SDHCI_S3C=y
  CONFIG_MMC_SDHCI_PXAV3=y
 +CONFIG_MMC_SDHCI_PXAV2=m
  CONFIG_MMC_SDHCI_SPEAR=y
  CONFIG_MMC_SDHCI_S3C_DMA=y
  CONFIG_MMC_SDHCI_BCM_KONA=y
@@@ -899,7 -877,6 +901,7 @@@ CONFIG_RTC_DRV_DA9063=
  CONFIG_RTC_DRV_EFI=m
  CONFIG_RTC_DRV_DIGICOLOR=m
  CONFIG_RTC_DRV_S3C=m
 +CONFIG_RTC_DRV_SA1100=m
  CONFIG_RTC_DRV_PL031=y
  CONFIG_RTC_DRV_AT91RM9200=m
  CONFIG_RTC_DRV_AT91SAM9=m
@@@ -958,8 -935,7 +960,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
@@@ -993,14 -969,8 +995,14 @@@ CONFIG_ARCH_TEGRA_2x_SOC=
  CONFIG_ARCH_TEGRA_3x_SOC=y
  CONFIG_ARCH_TEGRA_114_SOC=y
  CONFIG_ARCH_TEGRA_124_SOC=y
 +CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
  CONFIG_ARM_TEGRA_DEVFREQ=m
 +CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=m
 +CONFIG_EXTCON_MAX14577=m
 +CONFIG_EXTCON_MAX77693=m
 +CONFIG_EXTCON_MAX8997=m
  CONFIG_TI_AEMIF=y
 +CONFIG_EXYNOS5422_DMC=m
  CONFIG_IIO=y
  CONFIG_IIO_SW_TRIGGER=y
  CONFIG_ASPEED_ADC=m
@@@ -1052,14 -1022,12 +1054,14 @@@ CONFIG_PHY_SUN9I_USB=
  CONFIG_PHY_HIX5HD2_SATA=y
  CONFIG_PHY_BERLIN_SATA=y
  CONFIG_PHY_BERLIN_USB=y
 +CONFIG_PHY_MMP3_USB=m
  CONFIG_PHY_CPCAP_USB=m
  CONFIG_PHY_QCOM_APQ8064_SATA=m
  CONFIG_PHY_RCAR_GEN2=m
  CONFIG_PHY_ROCKCHIP_DP=m
  CONFIG_PHY_ROCKCHIP_USB=y
  CONFIG_PHY_SAMSUNG_USB2=m
 +CONFIG_PHY_EXYNOS5250_SATA=m
  CONFIG_PHY_UNIPHIER_USB2=y
  CONFIG_PHY_UNIPHIER_USB3=y
  CONFIG_PHY_MIPHY28LP=y
@@@ -1075,6 -1043,13 +1077,13 @@@ CONFIG_ROCKCHIP_EFUSE=
  CONFIG_NVMEM_IMX_OCOTP=y
  CONFIG_NVMEM_SUNXI_SID=y
  CONFIG_NVMEM_VF610_OCOTP=y
+ CONFIG_FSI=m
+ CONFIG_FSI_MASTER_GPIO=m
+ CONFIG_FSI_MASTER_HUB=m
+ CONFIG_FSI_MASTER_ASPEED=m
+ CONFIG_FSI_SCOM=m
+ CONFIG_FSI_SBEFIFO=m
+ CONFIG_FSI_OCC=m
  CONFIG_EXT4_FS=y
  CONFIG_AUTOFS4_FS=y
  CONFIG_MSDOS_FS=y