Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/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: (36 commits)
  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
  arm64: defconfig: Change CONFIG_AT803X_PHY from m to y
  ARM: shmobile: defconfig: Refresh for v5.4-rc1
  arm64: defconfig: Enable R8A77961 SoC
  ARM: configs: sunxi: Enable MICREL_PHY
  arm64: defconfig: add new Allwinner crypto options
  ARM: configs: sunxi: add new Allwinner crypto options
  ARM: tegra: Enable Tegra VDE driver in tegra_defconfig
  ARM: imx_v6_v7_defconfig: Enable CONFIG_TOUCHSCREEN_DA9052
  arm64: defconfig: Enable configs for S32V234
  arm64: defconfig: Enable CONFIG_KEYBOARD_IMX_SC_KEY as module
  arm64: defconfig: Enable SMMU v3 PMCG
  arm64: defconfig: Enable HiSilicon ZIP controller
  arm64: defconfig: enable Altera GPIO controller
  ARM: multi_v7_defconfig: Enable audio support for stm32mp157
  arm64: defconfig: enable rsu driver
  ...

diff --combined arch/arm/configs/imx_v6_v7_defconfig
index 0f7381ee0c375ff16db8ab7efe57d12dc9b88cd7,0ab75671bd0931afb5974fcdb79f0c519f394556..26d6dee67aa6de729fdb20921b795649d9f04219
--- 1/arch/arm/configs/imx_v6_v7_defconfig
--- 2/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@@ -179,6 -179,7 +179,7 @@@ CONFIG_MOUSE_PS2=
  CONFIG_MOUSE_PS2_ELANTECH=y
  CONFIG_INPUT_TOUCHSCREEN=y
  CONFIG_TOUCHSCREEN_ADS7846=y
+ CONFIG_TOUCHSCREEN_DA9052=y
  CONFIG_TOUCHSCREEN_EGALAX=y
  CONFIG_TOUCHSCREEN_GOODIX=y
  CONFIG_TOUCHSCREEN_MAX11801=y
@@@ -236,6 -237,7 +237,7 @@@ CONFIG_DA9062_WATCHDOG=
  CONFIG_DA9063_WATCHDOG=m
  CONFIG_RN5T618_WATCHDOG=y
  CONFIG_IMX2_WDT=y
+ CONFIG_IMX7ULP_WDT=y
  CONFIG_MFD_DA9052_I2C=y
  CONFIG_MFD_DA9062=y
  CONFIG_MFD_DA9063=y
@@@ -276,7 -278,6 +278,7 @@@ CONFIG_VIDEO_OV5640=
  CONFIG_VIDEO_OV5645=m
  CONFIG_IMX_IPUV3_CORE=y
  CONFIG_DRM=y
 +CONFIG_DRM_MSM=y
  CONFIG_DRM_PANEL_LVDS=y
  CONFIG_DRM_PANEL_SIMPLE=y
  CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
@@@ -335,7 -336,7 +337,7 @@@ CONFIG_NOP_USB_XCEIV=
  CONFIG_USB_MXS_PHY=y
  CONFIG_USB_GADGET=y
  CONFIG_USB_FSL_USB2=y
- CONFIG_USB_CONFIGFS=m
+ CONFIG_USB_CONFIGFS=y
  CONFIG_USB_CONFIGFS_SERIAL=y
  CONFIG_USB_CONFIGFS_ACM=y
  CONFIG_USB_CONFIGFS_OBEX=y

diff --combined arch/arm/configs/omap2plus_defconfig
index 89cce8d4bc6b13592dcea01fbea40bacbbb29d32,88d2a5bec540775f80c30ad361728ddd226438f8..8c37cc8ab6f2bb938f7fca8bd239054c286883ec
--- 1/arch/arm/configs/omap2plus_defconfig
--- 2/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -128,7 -128,6 +128,6 @@@ CONFIG_PCI_ENDPOINT_CONFIGFS=
  CONFIG_PCI_EPF_TEST=m
  CONFIG_DEVTMPFS=y
  CONFIG_DEVTMPFS_MOUNT=y
- CONFIG_DMA_CMA=y
  CONFIG_OMAP_OCP2SCP=y
  CONFIG_CONNECTOR=m
  CONFIG_MTD=y
@@@ -343,18 -342,16 +342,16 @@@ CONFIG_VIDEO_OMAP3=
  CONFIG_CEC_PLATFORM_DRIVERS=y
  # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
  CONFIG_VIDEO_TVP5150=m
+ CONFIG_VIDEO_MT9P031=m
  CONFIG_DRM=m
  CONFIG_DRM_OMAP=m
  CONFIG_OMAP5_DSS_HDMI=y
  CONFIG_OMAP2_DSS_SDI=y
  CONFIG_OMAP2_DSS_DSI=y
  CONFIG_DRM_OMAP_ENCODER_OPA362=m
- CONFIG_DRM_OMAP_ENCODER_TFP410=m
  CONFIG_DRM_OMAP_ENCODER_TPD12S015=m
- CONFIG_DRM_OMAP_CONNECTOR_DVI=m
  CONFIG_DRM_OMAP_CONNECTOR_HDMI=m
  CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m
- CONFIG_DRM_OMAP_PANEL_DPI=m
  CONFIG_DRM_OMAP_PANEL_DSI_CM=m
  CONFIG_DRM_TILCDC=m
  CONFIG_DRM_PANEL_SIMPLE=m
@@@ -539,11 -536,16 +536,16 @@@ CONFIG_NLS_CODEPAGE_437=
  CONFIG_NLS_ISO8859_1=y
  CONFIG_SECURITY=y
  CONFIG_CRYPTO_MICHAEL_MIC=y
+ CONFIG_CRYPTO_DEV_OMAP=m
+ CONFIG_CRYPTO_DEV_OMAP_SHAM=m
+ CONFIG_CRYPTO_DEV_OMAP_AES=m
+ CONFIG_CRYPTO_DEV_OMAP_DES=m
  CONFIG_CRC_CCITT=y
  CONFIG_CRC_T10DIF=y
  CONFIG_CRC_ITU_T=y
  CONFIG_CRC7=y
  CONFIG_LIBCRC32C=y
+ CONFIG_DMA_CMA=y
  CONFIG_FONTS=y
  CONFIG_FONT_8x8=y
  CONFIG_FONT_8x16=y
@@@ -554,4 -556,3 +556,4 @@@ CONFIG_DEBUG_INFO_DWARF4=
  CONFIG_MAGIC_SYSRQ=y
  CONFIG_SCHEDSTATS=y
  # CONFIG_DEBUG_BUGVERBOSE is not set
 +CONFIG_TI_CPSW_SWITCHDEV=y

diff --combined arch/arm/configs/qcom_defconfig
index 67c306fff3768af52ba1264f9bb4dd8664eef115,9792dd0aae0c8ba291e14b100340fa585aa4d960..4dd1d8ca44551dff5d6171033e8a6b8e1052d222
--- 1/arch/arm/configs/qcom_defconfig
--- 2/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@@ -5,6 -5,7 +5,6 @@@ CONFIG_IKCONFIG=
  CONFIG_IKCONFIG_PROC=y
  CONFIG_CGROUPS=y
  CONFIG_BLK_DEV_INITRD=y
 -CONFIG_SYSCTL_SYSCALL=y
  CONFIG_KALLSYMS_ALL=y
  CONFIG_EMBEDDED=y
  # CONFIG_SLUB_DEBUG is not set
@@@ -225,6 -226,7 +225,7 @@@ CONFIG_QCOM_WCNSS_PIL=
  CONFIG_RPMSG_CHAR=y
  CONFIG_RPMSG_QCOM_SMD=y
  CONFIG_QCOM_GSBI=y
+ CONFIG_QCOM_OCMEM=y
  CONFIG_QCOM_PM=y
  CONFIG_QCOM_SMEM=y
  CONFIG_QCOM_SMD_RPM=y

diff --combined arch/arm64/configs/defconfig
index 89b4feced4263ebe0753972789d389667d55d659,d3a289e12c92133ba74f9a3c982a94ad64051018..47d1b8fb19690547182e3e521e15beabba5ca1b2
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -29,6 -29,7 +29,7 @@@ CONFIG_BLK_DEV_INITRD=
  CONFIG_KALLSYMS_ALL=y
  # CONFIG_COMPAT_BRK is not set
  CONFIG_PROFILING=y
+ CONFIG_ARCH_ACTIONS=y
  CONFIG_ARCH_AGILEX=y
  CONFIG_ARCH_SUNXI=y
  CONFIG_ARCH_ALPINE=y
@@@ -48,6 -49,7 +49,7 @@@ CONFIG_ARCH_MXC=
  CONFIG_ARCH_QCOM=y
  CONFIG_ARCH_RENESAS=y
  CONFIG_ARCH_ROCKCHIP=y
+ CONFIG_ARCH_S32=y
  CONFIG_ARCH_SEATTLE=y
  CONFIG_ARCH_STRATIX10=y
  CONFIG_ARCH_SYNQUACER=y
@@@ -71,7 -73,6 +73,7 @@@ CONFIG_COMPAT=
  CONFIG_RANDOMIZE_BASE=y
  CONFIG_HIBERNATION=y
  CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 +CONFIG_ENERGY_MODEL=y
  CONFIG_ARM_CPUIDLE=y
  CONFIG_ARM_PSCI_CPUIDLE=y
  CONFIG_CPU_FREQ=y
@@@ -91,6 -92,7 +93,7 @@@ CONFIG_ARM_TEGRA186_CPUFREQ=
  CONFIG_ARM_SCPI_PROTOCOL=y
  CONFIG_RASPBERRYPI_FIRMWARE=y
  CONFIG_INTEL_STRATIX10_SERVICE=y
+ CONFIG_INTEL_STRATIX10_RSU=m
  CONFIG_TI_SCI_PROTOCOL=y
  CONFIG_EFI_CAPSULE_LOADER=y
  CONFIG_IMX_SCU=y
@@@ -115,6 -117,8 +118,8 @@@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=
  CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
  CONFIG_CRYPTO_CHACHA20_NEON=m
  CONFIG_CRYPTO_AES_ARM64_BS=m
+ CONFIG_CRYPTO_DEV_ALLWINNER=y
+ CONFIG_CRYPTO_DEV_SUN8I_CE=m
  CONFIG_JUMP_LABEL=y
  CONFIG_MODULES=y
  CONFIG_MODULE_UNLOAD=y
@@@ -212,6 -216,7 +217,7 @@@ CONFIG_MTD_NAND_DENALI_DT=
  CONFIG_MTD_NAND_MARVELL=y
  CONFIG_MTD_NAND_QCOM=y
  CONFIG_MTD_SPI_NOR=y
+ CONFIG_SPI_CADENCE_QUADSPI=y
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_BLK_DEV_NBD=m
  CONFIG_VIRTIO_BLK=y
@@@ -286,7 -291,7 +292,7 @@@ CONFIG_SNI_AVE=
  CONFIG_SNI_NETSEC=y
  CONFIG_STMMAC_ETH=m
  CONFIG_MDIO_BUS_MUX_MMIOREG=y
- CONFIG_AT803X_PHY=m
+ CONFIG_AT803X_PHY=y
  CONFIG_MARVELL_PHY=m
  CONFIG_MARVELL_10G_PHY=m
  CONFIG_MESON_GXL_PHY=m
@@@ -315,6 -320,7 +321,7 @@@ CONFIG_INPUT_EVDEV=
  CONFIG_KEYBOARD_ADC=m
  CONFIG_KEYBOARD_GPIO=y
  CONFIG_KEYBOARD_SNVS_PWRKEY=m
+ CONFIG_KEYBOARD_IMX_SC_KEY=m
  CONFIG_KEYBOARD_CROS_EC=y
  CONFIG_INPUT_TOUCHSCREEN=y
  CONFIG_TOUCHSCREEN_ATMEL_MXT=m
@@@ -353,6 -359,8 +360,8 @@@ CONFIG_SERIAL_XILINX_PS_UART=
  CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
  CONFIG_SERIAL_FSL_LPUART=y
  CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
+ CONFIG_SERIAL_FSL_LINFLEXUART=y
+ CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE=y
  CONFIG_SERIAL_MVEBU_UART=y
  CONFIG_SERIAL_DEV_BUS=y
  CONFIG_VIRTIO_CONSOLE=y
@@@ -412,6 -420,7 +421,7 @@@ CONFIG_PINCTRL_QDF2XXX=
  CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
  CONFIG_PINCTRL_SDM845=y
  CONFIG_PINCTRL_SM8150=y
+ CONFIG_GPIO_ALTERA=m
  CONFIG_GPIO_DWAPB=y
  CONFIG_GPIO_MB86S7X=y
  CONFIG_GPIO_PL061=y
@@@ -742,9 -751,11 +752,11 @@@ CONFIG_QCOM_SMD_RPM=
  CONFIG_QCOM_SMP2P=y
  CONFIG_QCOM_SMSM=y
  CONFIG_ARCH_R8A774A1=y
+ CONFIG_ARCH_R8A774B1=y
  CONFIG_ARCH_R8A774C0=y
  CONFIG_ARCH_R8A7795=y
  CONFIG_ARCH_R8A7796=y
+ CONFIG_ARCH_R8A77961=y
  CONFIG_ARCH_R8A77965=y
  CONFIG_ARCH_R8A77970=y
  CONFIG_ARCH_R8A77980=y
@@@ -802,6 -813,7 +814,7 @@@ CONFIG_PHY_ROCKCHIP_TYPEC=
  CONFIG_PHY_UNIPHIER_USB2=y
  CONFIG_PHY_UNIPHIER_USB3=y
  CONFIG_PHY_TEGRA_XUSB=y
+ CONFIG_ARM_SMMU_V3_PMU=m
  CONFIG_FSL_IMX8_DDR_PMU=m
  CONFIG_HISI_PMU=y
  CONFIG_QCOM_L2_PMU=y
@@@ -849,6 -861,7 +862,7 @@@ CONFIG_NLS_ISO8859_1=
  CONFIG_SECURITY=y
  CONFIG_CRYPTO_ECHAINIV=y
  CONFIG_CRYPTO_ANSI_CPRNG=y
+ CONFIG_CRYPTO_DEV_HISI_ZIP=m
  CONFIG_DMA_CMA=y
  CONFIG_CMA_SIZE_MBYTES=32
  CONFIG_PRINTK_TIME=y