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

Pull ARM SoC defconfig updates from Arnd Bergmann:
 "These are the usual defconfig updates, adding support for additional
  modules and updating some files according to changes in Kconfig.

  I also include the removal of CONFIG_BACKLIGHT_GENERIC across multiple
  architectures, after the driver was removed"

* tag 'arm-soc-defconfig-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (41 commits)
  powerpc/configs: drop unused BACKLIGHT_GENERIC option
  parisc: configs: drop unused BACKLIGHT_GENERIC option
  arm64: defconfig: drop unused BACKLIGHT_GENERIC option
  ARM: configs: drop unused BACKLIGHT_GENERIC option
  arm64: defconfig: Enable more Librem 5 hardware
  arm64: defconfig: Enable RTC_DRV_HYM8563
  arm64: defconfig: Enable USB_SERIAL_CP210X
  arm64: defconfig: Enable PHY_ROCKCHIP_INNO_DSIDPHY
  arm64: defconfig: Enable ROCKCHIP_LVDS
  arm64: defconfig: Enable ARM SCMI protocol and drivers
  ARM: multi_v7_defconfig: Enable ARM SCMI protocol and drivers
  ARM: multi_v7_defconfig: enable STM32 dfsdm audio support
  ARM: multi_v7_defconfig: enable STM32 spdifrx support
  ARM: multi_v7_defconfig: enable STUSB160X Type-C port controller support
  ARM: multi_v7_defconfig: add STM32 crypto support
  ARM: multi_v7_defconfig: enable counter subsystem and stm32 counter drivers
  ARM: multi_v7_defconfig: make Samsung Exynos EHCI driver a module
  arm64: defconfig: Enable Qualcomm PON driver
  ARM: omap2plus_defconfig: Enable TI eQEP counter driver
  ARM: multi_v7_defconfig: ti: Enable networking options for nfs boot
  ...

diff --combined arch/arm/configs/omap2plus_defconfig
index 58df9fd79a76a5b2e3aa336086bf42eb35c36260,ba2b3f89c0fadfff31157f40e1b7eaee77e26642..1c11d1557779aedde6500e11a0ac54c6c6613542
--- 1/arch/arm/configs/omap2plus_defconfig
--- 2/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -81,6 -81,7 +81,6 @@@ CONFIG_PARTITION_ADVANCED=
  CONFIG_BINFMT_MISC=y
  CONFIG_CMA=y
  CONFIG_ZSMALLOC=m
 -CONFIG_ZSMALLOC_PGTABLE_MAPPING=y
  CONFIG_NET=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
@@@ -313,6 -314,7 +313,7 @@@ CONFIG_THERMAL_GOV_FAIR_SHARE=
  CONFIG_THERMAL_GOV_USER_SPACE=y
  CONFIG_CPU_THERMAL=y
  CONFIG_TI_THERMAL=y
+ CONFIG_OMAP3_THERMAL=y
  CONFIG_OMAP4_THERMAL=y
  CONFIG_OMAP5_THERMAL=y
  CONFIG_DRA752_THERMAL=y
@@@ -388,7 -390,6 +389,6 @@@ CONFIG_FB_TILEBLITTING=
  CONFIG_LCD_CLASS_DEVICE=y
  CONFIG_LCD_PLATFORM=y
  CONFIG_BACKLIGHT_CLASS_DEVICE=y
- CONFIG_BACKLIGHT_GENERIC=m
  CONFIG_BACKLIGHT_PWM=m
  CONFIG_BACKLIGHT_PANDORA=m
  CONFIG_BACKLIGHT_GPIO=m
@@@ -523,6 -524,8 +523,8 @@@ CONFIG_TI_AM335X_ADC=
  CONFIG_TWL4030_MADC=m
  CONFIG_SENSORS_ISL29028=m
  CONFIG_BMP280=m
+ CONFIG_KXCJK1013=m
+ CONFIG_AK8975=m
  CONFIG_PWM=y
  CONFIG_PWM_OMAP_DMTIMER=m
  CONFIG_PWM_TIECAP=m
@@@ -535,6 -538,8 +537,8 @@@ CONFIG_PHY_DM816X_USB=
  CONFIG_OMAP_USB2=m
  CONFIG_TI_PIPE3=y
  CONFIG_TWL4030_USB=m
+ CONFIG_COUNTER=m
+ CONFIG_TI_EQEP=m
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y
  CONFIG_EXT4_FS_SECURITY=y

diff --combined arch/arm64/configs/defconfig
index d93ffbdedfc0aee2f62f0c4d7325e2971fd7f1da,6493079e2c54ece12f1c97c4e96b9e222a0f0951..c8ca76751a34bff365b67a47ccf843565d6fff18
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -93,12 -93,15 +93,15 @@@ CONFIG_ARM_IMX_CPUFREQ_DT=
  CONFIG_ARM_QCOM_CPUFREQ_NVMEM=y
  CONFIG_ARM_QCOM_CPUFREQ_HW=y
  CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
+ CONFIG_ARM_SCMI_CPUFREQ=y
  CONFIG_ARM_TEGRA186_CPUFREQ=y
  CONFIG_QORIQ_CPUFREQ=y
+ CONFIG_ARM_SCMI_PROTOCOL=y
  CONFIG_ARM_SCPI_PROTOCOL=y
  CONFIG_RASPBERRYPI_FIRMWARE=y
  CONFIG_INTEL_STRATIX10_SERVICE=y
  CONFIG_INTEL_STRATIX10_RSU=m
+ CONFIG_QCOM_SCM=y
  CONFIG_EFI_CAPSULE_LOADER=y
  CONFIG_IMX_SCU=y
  CONFIG_IMX_SCU_PD=y
@@@ -240,6 -243,8 +243,8 @@@ CONFIG_HISILICON_LPC=
  CONFIG_SIMPLE_PM_BUS=y
  CONFIG_FSL_MC_BUS=y
  CONFIG_TEGRA_ACONNECT=m
+ CONFIG_GNSS=m
+ CONFIG_GNSS_MTK_SERIAL=m
  CONFIG_MTD=y
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_CFI=y
@@@ -381,6 -386,7 +386,7 @@@ CONFIG_KEYBOARD_IMX_SC_KEY=
  CONFIG_KEYBOARD_CROS_EC=y
  CONFIG_INPUT_TOUCHSCREEN=y
  CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+ CONFIG_TOUCHSCREEN_EDT_FT5X06=m
  CONFIG_INPUT_MISC=y
  CONFIG_INPUT_PM8941_PWRKEY=y
  CONFIG_INPUT_PM8XXX_VIBRATOR=m
@@@ -438,6 -444,7 +444,7 @@@ CONFIG_I2C_IMX=
  CONFIG_I2C_IMX_LPI2C=y
  CONFIG_I2C_MESON=y
  CONFIG_I2C_MV64XXX=y
+ CONFIG_I2C_OMAP=y
  CONFIG_I2C_OWL=y
  CONFIG_I2C_PXA=y
  CONFIG_I2C_QCOM_CCI=m
@@@ -483,7 -490,6 +490,7 @@@ CONFIG_PINCTRL_IMX8MP=
  CONFIG_PINCTRL_IMX8MQ=y
  CONFIG_PINCTRL_IMX8QXP=y
  CONFIG_PINCTRL_IMX8DXL=y
 +CONFIG_PINCTRL_MSM=y
  CONFIG_PINCTRL_IPQ8074=y
  CONFIG_PINCTRL_IPQ6018=y
  CONFIG_PINCTRL_MSM8916=y
@@@ -498,6 -504,7 +505,7 @@@ CONFIG_PINCTRL_SDM845=
  CONFIG_PINCTRL_SM8150=y
  CONFIG_PINCTRL_SM8250=y
  CONFIG_GPIO_ALTERA=m
+ CONFIG_GPIO_DAVINCI=y
  CONFIG_GPIO_DWAPB=y
  CONFIG_GPIO_MB86S7X=y
  CONFIG_GPIO_MPC8XXX=y
@@@ -518,11 -525,15 +526,15 @@@ CONFIG_POWER_AVS=
  CONFIG_QCOM_CPR=y
  CONFIG_ROCKCHIP_IODOMAIN=y
  CONFIG_POWER_RESET_MSM=y
+ CONFIG_POWER_RESET_QCOM_PON=m
  CONFIG_POWER_RESET_XGENE=y
  CONFIG_POWER_RESET_SYSCON=y
  CONFIG_SYSCON_REBOOT_MODE=y
  CONFIG_BATTERY_SBS=m
  CONFIG_BATTERY_BQ27XXX=y
+ CONFIG_SENSORS_ARM_SCMI=y
+ CONFIG_BATTERY_MAX17042=m
+ CONFIG_CHARGER_BQ25980=m
  CONFIG_SENSORS_ARM_SCPI=y
  CONFIG_SENSORS_LM90=m
  CONFIG_SENSORS_PWM_FAN=m
@@@ -597,6 -608,7 +609,7 @@@ CONFIG_REGULATOR_QCOM_SMD_RPM=
  CONFIG_REGULATOR_QCOM_SPMI=y
  CONFIG_REGULATOR_RK808=y
  CONFIG_REGULATOR_S2MPS11=y
+ CONFIG_REGULATOR_TPS65132=m
  CONFIG_REGULATOR_VCTRL=m
  CONFIG_RC_CORE=m
  CONFIG_RC_DECODERS=y
@@@ -647,6 -659,7 +660,7 @@@ CONFIG_ROCKCHIP_CDN_DP=
  CONFIG_ROCKCHIP_DW_HDMI=y
  CONFIG_ROCKCHIP_DW_MIPI_DSI=y
  CONFIG_ROCKCHIP_INNO_HDMI=y
+ CONFIG_ROCKCHIP_LVDS=y
  CONFIG_DRM_RCAR_DU=m
  CONFIG_DRM_RCAR_DW_HDMI=m
  CONFIG_DRM_SUN4I=m
@@@ -657,6 -670,7 +671,7 @@@ CONFIG_DRM_MSM=
  CONFIG_DRM_TEGRA=m
  CONFIG_DRM_PANEL_LVDS=m
  CONFIG_DRM_PANEL_SIMPLE=m
+ CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
  CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
  CONFIG_DRM_PANEL_SITRONIX_ST7703=m
  CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
@@@ -671,6 -685,7 +686,7 @@@ CONFIG_DRM_I2C_ADV7511=
  CONFIG_DRM_I2C_ADV7511_AUDIO=y
  CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
  CONFIG_DRM_DW_HDMI_CEC=m
+ CONFIG_DRM_IMX_DCSS=m
  CONFIG_DRM_VC4=m
  CONFIG_DRM_ETNAVIV=m
  CONFIG_DRM_HISI_HIBMC=m
@@@ -683,7 -698,6 +699,6 @@@ CONFIG_DRM_PANFROST=
  CONFIG_FB=y
  CONFIG_FB_MODE_HELPERS=y
  CONFIG_FB_EFI=y
- CONFIG_BACKLIGHT_GENERIC=m
  CONFIG_BACKLIGHT_PWM=m
  CONFIG_BACKLIGHT_LP855X=m
  CONFIG_LOGO=y
@@@ -696,6 -710,12 +711,12 @@@ CONFIG_SND_HDA_CODEC_HDMI=
  CONFIG_SND_SOC=y
  CONFIG_SND_BCM2835_SOC_I2S=m
  CONFIG_SND_SOC_FSL_SAI=m
+ CONFIG_SND_SOC_FSL_ASRC=m
+ CONFIG_SND_SOC_FSL_MICFIL=m
+ CONFIG_SND_SOC_FSL_EASRC=m
+ CONFIG_SND_IMX_SOC=m
+ CONFIG_SND_SOC_IMX_SPDIF=m
+ CONFIG_SND_SOC_IMX_AUDMIX=m
  CONFIG_SND_MESON_AXG_SOUND_CARD=m
  CONFIG_SND_MESON_GX_SOUND_CARD=m
  CONFIG_SND_SOC_QCOM=m
@@@ -708,6 -728,7 +729,7 @@@ CONFIG_SND_SOC_ROCKCHIP_RT5645=
  CONFIG_SND_SOC_RK3399_GRU_SOUND=m
  CONFIG_SND_SOC_SAMSUNG=y
  CONFIG_SND_SOC_RCAR=m
+ CONFIG_SND_SUN4I_I2S=m
  CONFIG_SND_SUN4I_SPDIF=m
  CONFIG_SND_SOC_TEGRA=m
  CONFIG_SND_SOC_TEGRA210_AHUB=m
@@@ -751,6 -772,7 +773,7 @@@ CONFIG_USB_CHIPIDEA_UDC=
  CONFIG_USB_CHIPIDEA_HOST=y
  CONFIG_USB_ISP1760=y
  CONFIG_USB_SERIAL=m
+ CONFIG_USB_SERIAL_CP210X=m
  CONFIG_USB_SERIAL_FTDI_SIO=m
  CONFIG_USB_HSIC_USB3503=y
  CONFIG_NOP_USB_XCEIV=y
@@@ -773,6 -795,7 +796,7 @@@ CONFIG_TYPEC=
  CONFIG_TYPEC_TCPM=m
  CONFIG_TYPEC_FUSB302=m
  CONFIG_TYPEC_HD3SS3220=m
+ CONFIG_TYPEC_TPS6598X=m
  CONFIG_MMC=y
  CONFIG_MMC_BLOCK_MINORS=32
  CONFIG_MMC_ARMMMCI=y
@@@ -802,6 -825,7 +826,7 @@@ CONFIG_MMC_SDHCI_AM654=
  CONFIG_MMC_OWL=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
+ CONFIG_LEDS_LM3692X=m
  CONFIG_LEDS_GPIO=y
  CONFIG_LEDS_PWM=y
  CONFIG_LEDS_SYSCON=y
@@@ -815,6 -839,7 +840,7 @@@ CONFIG_EDAC=
  CONFIG_EDAC_GHES=y
  CONFIG_RTC_CLASS=y
  CONFIG_RTC_DRV_DS1307=m
+ CONFIG_RTC_DRV_HYM8563=m
  CONFIG_RTC_DRV_MAX77686=y
  CONFIG_RTC_DRV_RK808=m
  CONFIG_RTC_DRV_PCF85363=m
@@@ -866,6 -891,7 +892,7 @@@ CONFIG_CROS_EC=
  CONFIG_CROS_EC_I2C=y
  CONFIG_CROS_EC_SPI=y
  CONFIG_CROS_EC_CHARDEV=m
+ CONFIG_COMMON_CLK_SCMI=y
  CONFIG_COMMON_CLK_RK808=y
  CONFIG_COMMON_CLK_SCPI=y
  CONFIG_COMMON_CLK_CS2000_CP=y
@@@ -931,6 -957,7 +958,7 @@@ CONFIG_RASPBERRYPI_POWER=
  CONFIG_FSL_DPAA=y
  CONFIG_FSL_MC_DPIO=y
  CONFIG_QCOM_AOSS_QMP=y
+ CONFIG_QCOM_COMMAND_DB=y
  CONFIG_QCOM_GENI_SE=y
  CONFIG_QCOM_RMTFS_MEM=m
  CONFIG_QCOM_RPMH=y
@@@ -955,11 -982,13 +983,13 @@@ CONFIG_ARCH_R8A77970=
  CONFIG_ARCH_R8A77980=y
  CONFIG_ARCH_R8A77990=y
  CONFIG_ARCH_R8A77995=y
+ CONFIG_ARCH_R8A779A0=y
  CONFIG_ROCKCHIP_PM_DOMAINS=y
  CONFIG_ARCH_TEGRA_132_SOC=y
  CONFIG_ARCH_TEGRA_210_SOC=y
  CONFIG_ARCH_TEGRA_186_SOC=y
  CONFIG_ARCH_TEGRA_194_SOC=y
+ CONFIG_ARCH_TEGRA_234_SOC=y
  CONFIG_ARCH_K3_AM6_SOC=y
  CONFIG_ARCH_K3_J721E_SOC=y
  CONFIG_TI_SCI_PM_DOMAINS=y
@@@ -974,8 -1003,10 +1004,10 @@@ CONFIG_QCOM_SPMI_ADC5=
  CONFIG_ROCKCHIP_SARADC=m
  CONFIG_IIO_CROS_EC_SENSORS_CORE=m
  CONFIG_IIO_CROS_EC_SENSORS=m
+ CONFIG_IIO_ST_LSM6DSX=m
  CONFIG_IIO_CROS_EC_LIGHT_PROX=m
  CONFIG_SENSORS_ISL29018=m
+ CONFIG_VCNL4000=m
  CONFIG_IIO_CROS_EC_BARO=m
  CONFIG_MPL3115=m
  CONFIG_PWM=y
@@@ -1011,6 -1042,7 +1043,7 @@@ CONFIG_PHY_RCAR_GEN3_USB3=
  CONFIG_PHY_ROCKCHIP_EMMC=y
  CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
  CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+ CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
  CONFIG_PHY_ROCKCHIP_PCIE=m
  CONFIG_PHY_ROCKCHIP_TYPEC=y
  CONFIG_PHY_UNIPHIER_USB2=y
@@@ -1043,6 -1075,7 +1076,7 @@@ CONFIG_MUX_MMIO=
  CONFIG_INTERCONNECT=y
  CONFIG_INTERCONNECT_QCOM=y
  CONFIG_INTERCONNECT_QCOM_MSM8916=m
+ CONFIG_INTERCONNECT_QCOM_OSM_L3=m
  CONFIG_INTERCONNECT_QCOM_SDM845=m
  CONFIG_INTERCONNECT_QCOM_SM8150=m
  CONFIG_INTERCONNECT_QCOM_SM8250=m
@@@ -1083,7 -1116,6 +1117,7 @@@ CONFIG_CRYPTO_DEV_CCREE=
  CONFIG_CRYPTO_DEV_HISI_SEC2=m
  CONFIG_CRYPTO_DEV_HISI_ZIP=m
  CONFIG_CRYPTO_DEV_HISI_HPRE=m
 +CONFIG_CRYPTO_DEV_HISI_TRNG=m
  CONFIG_CMA_SIZE_MBYTES=32
  CONFIG_PRINTK_TIME=y
  CONFIG_DEBUG_INFO=y