Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

Pull ARM SoC defconfig updates from Arnd Bergmann:
 "The defconfig changes are split out from the rest again. This time we
  have a number of changes for NXP i.MX and Renesas, including a cleanup
  of old options.

  Some smaller changes are for Socionext Uniphier, Allwinner, Qualcomm,
  Rockchip, Renesas, AT91, Hisilicon, and STM32. All of these just
  enable platform specific device drivers"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (40 commits)
  arm64: defconfig: Enable SERIAL_8250_OMAP
  arm64: defconfig: Enable TI_SCI related configs
  ARM: imx_v6_v7_defconfig: Select CONFIG_TMPFS_POSIX_ACL
  ARM: imx_v4_v5_defconfig: Remove unneeded options
  ARM: imx_v4_v5_defconfig: Re-sync defconfig
  ARM: mxs_defconfig: Remove unneeded options
  ARM: mxs_defconfig: Re-sync defconfig
  ARM: imx_v6_v7_defconfig: Remove unneeded options
  ARM: imx_v6_v7_defconfig: Re-sync defconfig
  ARM: imx_v6_v7_defconfig: select CONFIG_ARM_CPUIDLE by default
  ARM: imx_v6_v7_defconfig: Make usbnet drivers builtin for boot
  ARM: imx_v6_v7_defconfig: add CONFIG_FW_LOADER_USER_HELPER
  ARM: imx_v6_v7_defconfig: Select CONFIG_SENSORS_MC13783_ADC
  ARM: multi_v7_defconfig: enable CONFIG_MMC_UNIPHIER
  arm64: defconfig: enable CONFIG_MMC_UNIPHIER
  ARM: multi_v7_defconfig: Enable USB phys for UniPhier SoCs
  arm64: defconfig: Enable USB phys for UniPhier SoCs
  arm64: defconfig: enable Rockchip Innosilicon hdmiphy
  arm64: defconfig: Enable PCIEPORTBUS
  arm64: defconfig: enable HiSilicon HNS3 driver
  ...

diff --combined arch/arm64/configs/defconfig
index 3d165b4,905b3f3..3cb9956
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -50,6 -50,8 +50,8 @@@ CONFIG_ARCH_ROCKCHIP=
  CONFIG_ARCH_SEATTLE=y
  CONFIG_ARCH_SYNQUACER=y
  CONFIG_ARCH_RENESAS=y
+ CONFIG_ARCH_R8A774A1=y
+ CONFIG_ARCH_R8A774C0=y
  CONFIG_ARCH_R8A7795=y
  CONFIG_ARCH_R8A7796=y
  CONFIG_ARCH_R8A77965=y
@@@ -68,6 -70,7 +70,7 @@@ CONFIG_ARCH_XGENE=
  CONFIG_ARCH_ZX=y
  CONFIG_ARCH_ZYNQMP=y
  CONFIG_PCI=y
+ CONFIG_PCIEPORTBUS=y
  CONFIG_PCI_IOV=y
  CONFIG_HOTPLUG_PCI=y
  CONFIG_HOTPLUG_PCI_ACPI=y
@@@ -115,6 -118,7 +118,7 @@@ CONFIG_ARM_ARMADA_37XX_CPUFREQ=
  CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
  CONFIG_ARM_SCPI_CPUFREQ=y
  CONFIG_ARM_TEGRA186_CPUFREQ=y
+ CONFIG_TI_SCI_PROTOCOL=y
  CONFIG_NET=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
@@@ -150,6 -154,9 +154,9 @@@ CONFIG_BRIDGE_VLAN_FILTERING=
  CONFIG_VLAN_8021Q=m
  CONFIG_VLAN_8021Q_GVRP=y
  CONFIG_VLAN_8021Q_MVRP=y
+ CONFIG_QRTR=m
+ CONFIG_QRTR_SMD=m
+ CONFIG_QRTR_TUN=m
  CONFIG_BPF_JIT=y
  CONFIG_BT=m
  CONFIG_BT_HIDP=m
@@@ -222,6 -229,9 +229,9 @@@ CONFIG_THUNDER_NIC_PF=
  CONFIG_HIX5HD2_GMAC=y
  CONFIG_HNS_DSAF=y
  CONFIG_HNS_ENET=y
+ CONFIG_HNS3=y
+ CONFIG_HNS3_HCLGE=y
+ CONFIG_HNS3_ENET=y
  CONFIG_E1000E=y
  CONFIG_IGB=y
  CONFIG_IGBVF=y
@@@ -279,6 -289,7 +289,7 @@@ CONFIG_SERIAL_8250_EXTENDED=
  CONFIG_SERIAL_8250_SHARE_IRQ=y
  CONFIG_SERIAL_8250_BCM2835AUX=y
  CONFIG_SERIAL_8250_DW=y
+ CONFIG_SERIAL_8250_OMAP=y
  CONFIG_SERIAL_8250_MT6577=y
  CONFIG_SERIAL_8250_UNIPHIER=y
  CONFIG_SERIAL_OF_PLATFORM=y
@@@ -434,6 -445,7 +445,7 @@@ CONFIG_DRM_EXYNOS_DSI=
  CONFIG_DRM_EXYNOS_HDMI=y
  CONFIG_DRM_EXYNOS_MIC=y
  CONFIG_DRM_ROCKCHIP=m
+ CONFIG_DRM_SUN4I=m
  CONFIG_ROCKCHIP_ANALOGIX_DP=y
  CONFIG_ROCKCHIP_CDN_DP=y
  CONFIG_ROCKCHIP_DW_HDMI=y
@@@ -520,6 -532,7 +532,7 @@@ CONFIG_MMC_MESON_GX=
  CONFIG_MMC_SDHCI_MSM=y
  CONFIG_MMC_SPI=y
  CONFIG_MMC_SDHI=y
+ CONFIG_MMC_UNIPHIER=y
  CONFIG_MMC_DW=y
  CONFIG_MMC_DW_EXYNOS=y
  CONFIG_MMC_DW_HI3798CV200=y
@@@ -577,6 -590,7 +590,7 @@@ CONFIG_COMMON_CLK_CS2000_CP=
  CONFIG_COMMON_CLK_S2MPS11=y
  CONFIG_CLK_QORIQ=y
  CONFIG_COMMON_CLK_PWM=y
+ CONFIG_TI_SCI_CLK=y
  CONFIG_COMMON_CLK_QCOM=y
  CONFIG_QCOM_CLK_SMD_RPM=y
  CONFIG_IPQ_GCC_8074=y
@@@ -588,6 -602,7 +602,7 @@@ CONFIG_HWSPINLOCK_QCOM=
  CONFIG_ARM_MHU=y
  CONFIG_PLATFORM_MHU=y
  CONFIG_BCM2835_MBOX=y
+ CONFIG_TI_MESSAGE_MANAGER=y
  CONFIG_QCOM_APCS_IPC=y
  CONFIG_ROCKCHIP_IOMMU=y
  CONFIG_TEGRA_IOMMU_SMMU=y
@@@ -608,6 -623,7 +623,7 @@@ CONFIG_ARCH_TEGRA_186_SOC=
  CONFIG_ARCH_TEGRA_194_SOC=y
  CONFIG_ARCH_K3_AM6_SOC=y
  CONFIG_SOC_TI=y
+ CONFIG_TI_SCI_PM_DOMAINS=y
  CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
  CONFIG_EXTCON_USB_GPIO=y
  CONFIG_EXTCON_USBC_CROS_EC=y
@@@ -627,6 -643,7 +643,7 @@@ CONFIG_PWM_RCAR=
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_PWM_SAMSUNG=y
  CONFIG_PWM_TEGRA=m
+ CONFIG_RESET_TI_SCI=y
  CONFIG_PHY_XGENE=y
  CONFIG_PHY_SUN4I_USB=y
  CONFIG_PHY_HI6220_USB=y
@@@ -638,10 -655,13 +655,13 @@@ CONFIG_PHY_QCOM_USB_HS=
  CONFIG_PHY_RCAR_GEN3_USB2=y
  CONFIG_PHY_RCAR_GEN3_USB3=m
  CONFIG_PHY_ROCKCHIP_EMMC=y
+ CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
  CONFIG_PHY_ROCKCHIP_INNO_USB2=y
  CONFIG_PHY_ROCKCHIP_PCIE=m
  CONFIG_PHY_ROCKCHIP_TYPEC=y
  CONFIG_PHY_TEGRA_XUSB=y
+ CONFIG_PHY_UNIPHIER_USB3=y
+ CONFIG_PHY_UNIPHIER_USB2=y
  CONFIG_HISI_PMU=y
  CONFIG_QCOM_L2_PMU=y
  CONFIG_QCOM_L3_PMU=y
@@@ -698,7 -718,6 +718,7 @@@ CONFIG_MEMTEST=
  CONFIG_SECURITY=y
  CONFIG_CRYPTO_ECHAINIV=y
  CONFIG_CRYPTO_ANSI_CPRNG=y
 +CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=y
  CONFIG_ARM64_CRYPTO=y
  CONFIG_CRYPTO_SHA1_ARM64_CE=y
  CONFIG_CRYPTO_SHA2_ARM64_CE=y
@@@ -707,6 -726,7 +727,6 @@@ CONFIG_CRYPTO_SHA3_ARM64=
  CONFIG_CRYPTO_SM3_ARM64_CE=m
  CONFIG_CRYPTO_GHASH_ARM64_CE=y
  CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 -CONFIG_CRYPTO_CRC32_ARM64_CE=m
  CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
  CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
  CONFIG_CRYPTO_CHACHA20_NEON=m