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

Pull ARM defconfig updates from Arnd Bergmann:
 "Various additions to the defconfig files to enable more drivers for
  already supported platforms, usually as loadable modules"

* tag 'soc-defconfig-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (24 commits)
  ARM: multi_v7_defconfig: Add SCMI regulator support
  ARM: multi_v7_defconfig: Enable OMAP audio/display support
  ARM: multi_v7_defconfig: Enable TI Remoteproc and related configs
  ARM: multi_v7_defconfig: Enable TLV320AIC3x
  arm64: defconfig: Enable Redpine 91X wlan driver
  arm64: defconfig: Enable ITE_IT66121 HDMI transmitter
  arm64: defconfig: Enable IPQ5018 SoC base configs
  arm64: defconfig: Enable CONFIG_DRM_IMX_LCDIF
  arm64: defconfig: Enable TI PRUSS
  arm64: defconfig: Enable various configs for TI K3 platforms
  arm64: defconfig: enable driver for bluetooth nxp uart
  arm64: defconfig: Enable i.MX93 devices
  arm64: defconfig: Enable drivers for the Odroid-M1 board
  arm64: defconfig: Enable GPIO_SYSCON
  arm64: defconfig: select IMX_REMOTEPROC and RPMSG_VIRTIO
  arm64: defconfig: enable SL28VPD NVMEM layout
  arm64: defconfig: enable the SerDes PHY for Qualcomm DWMAC
  arm64: defconfig: Enable Rockchip OTP memory driver
  arm64: defconfig: Enable PHY_ROCKCHIP_NANENG_COMBO_PHY
  arm64: defconfig: Enable PMIC RAA215300 and RTC ISL 1208 configs
  ...

diff --combined arch/arm/configs/multi_v7_defconfig
index 766f2f8,fa3b4da..23fc49f
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -3,7 -3,7 +3,7 @@@ CONFIG_NO_HZ_IDLE=
  CONFIG_HIGH_RES_TIMERS=y
  CONFIG_CGROUPS=y
  CONFIG_BLK_DEV_INITRD=y
 -CONFIG_EMBEDDED=y
 +CONFIG_EXPERT=y
  CONFIG_PERF_EVENTS=y
  CONFIG_ARCH_VIRT=y
  CONFIG_ARCH_AIROHA=y
@@@ -613,6 -613,7 +613,7 @@@ CONFIG_REGULATOR_ACT8865=
  CONFIG_REGULATOR_ACT8945A=y
  CONFIG_REGULATOR_ANATOP=y
  CONFIG_REGULATOR_AB8500=y
+ CONFIG_REGULATOR_ARM_SCMI=y
  CONFIG_REGULATOR_AS3711=y
  CONFIG_REGULATOR_AS3722=y
  CONFIG_REGULATOR_AXP20X=y
@@@ -714,6 -715,8 +715,8 @@@ CONFIG_ROCKCHIP_INNO_HDMI=
  CONFIG_DRM_ATMEL_HLCDC=m
  CONFIG_DRM_RCAR_DU=m
  CONFIG_DRM_SUN4I=m
+ CONFIG_DRM_OMAP=m
+ CONFIG_OMAP5_DSS_HDMI=y
  CONFIG_DRM_MSM=m
  CONFIG_DRM_FSL_DCU=m
  CONFIG_DRM_TEGRA=y
@@@ -737,6 -740,8 +740,8 @@@ CONFIG_DRM_SII9234=
  CONFIG_DRM_SIMPLE_BRIDGE=m
  CONFIG_DRM_TOSHIBA_TC358764=m
  CONFIG_DRM_TOSHIBA_TC358768=m
+ CONFIG_DRM_TI_TFP410=m
+ CONFIG_DRM_TI_TPD12S015=m
  CONFIG_DRM_I2C_ADV7511=m
  CONFIG_DRM_I2C_ADV7511_AUDIO=y
  CONFIG_DRM_STI=m
@@@ -825,6 -830,7 +830,7 @@@ CONFIG_SND_SOC_SGTL5000=
  CONFIG_SND_SOC_STI_SAS=m
  CONFIG_SND_SOC_TLV320AIC32X4=m
  CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+ CONFIG_SND_SOC_TLV320AIC3X_I2C=m
  CONFIG_SND_SOC_WM8960=m
  CONFIG_SND_SOC_WM8962=m
  CONFIG_SND_SOC_WM8978=m
@@@ -1058,16 -1064,23 +1064,23 @@@ CONFIG_MSM_GCC_8916=
  CONFIG_MSM_MMCC_8960=y
  CONFIG_MSM_MMCC_8974=y
  CONFIG_HWSPINLOCK=y
+ CONFIG_HWSPINLOCK_OMAP=y
  CONFIG_HWSPINLOCK_QCOM=y
+ CONFIG_OMAP2PLUS_MBOX=y
  CONFIG_BCM2835_MBOX=y
  CONFIG_QCOM_APCS_IPC=y
  CONFIG_QCOM_IPCC=y
+ CONFIG_OMAP_IOMMU=y
+ CONFIG_OMAP_IOMMU_DEBUG=y
  CONFIG_ROCKCHIP_IOMMU=y
  CONFIG_TEGRA_IOMMU_GART=y
  CONFIG_TEGRA_IOMMU_SMMU=y
  CONFIG_EXYNOS_IOMMU=y
  CONFIG_QCOM_IOMMU=y
  CONFIG_REMOTEPROC=y
+ CONFIG_OMAP_REMOTEPROC=m
+ CONFIG_OMAP_REMOTEPROC_WATCHDOG=y
+ CONFIG_KEYSTONE_REMOTEPROC=m
  CONFIG_QCOM_Q6V5_MSS=m
  CONFIG_QCOM_SYSMON=m
  CONFIG_QCOM_WCNSS_PIL=m
@@@ -1226,7 -1239,7 +1239,7 @@@ CONFIG_COUNTER=
  CONFIG_STM32_TIMER_CNT=m
  CONFIG_STM32_LPTIMER_CNT=m
  CONFIG_EXT4_FS=y
 -CONFIG_AUTOFS4_FS=y
 +CONFIG_AUTOFS_FS=y
  CONFIG_MSDOS_FS=y
  CONFIG_VFAT_FS=y
  CONFIG_NTFS_FS=y

diff --combined arch/arm64/configs/defconfig
index a25d783,bf99298..2e9636d
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -180,6 -180,8 +180,8 @@@ CONFIG_NET_ACT_GATE=
  CONFIG_QRTR_SMD=m
  CONFIG_QRTR_TUN=m
  CONFIG_CAN=m
+ CONFIG_CAN_M_CAN=m
+ CONFIG_CAN_M_CAN_PLATFORM=m
  CONFIG_BT=m
  CONFIG_BT_HIDP=m
  # CONFIG_BT_LE is not set
@@@ -195,6 -197,7 +197,7 @@@ CONFIG_BT_HCIUART_MRVL=
  CONFIG_BT_MRVL=m
  CONFIG_BT_MRVL_SDIO=m
  CONFIG_BT_QCOMSMD=m
+ CONFIG_BT_NXPUART=m
  CONFIG_CFG80211=m
  CONFIG_MAC80211=m
  CONFIG_MAC80211_LEDS=y
@@@ -229,6 -232,7 +232,7 @@@ CONFIG_PCI_LAYERSCAPE=
  CONFIG_PCI_HISI=y
  CONFIG_PCIE_QCOM=y
  CONFIG_PCIE_ARMADA_8K=y
+ CONFIG_PCIE_ROCKCHIP_DW_HOST=y
  CONFIG_PCIE_KIRIN=y
  CONFIG_PCIE_HISI_STB=y
  CONFIG_PCIE_TEGRA194_HOST=m
@@@ -297,6 -301,7 +301,7 @@@ CONFIG_ATA=
  CONFIG_SATA_AHCI=y
  CONFIG_SATA_AHCI_PLATFORM=y
  CONFIG_AHCI_BRCM=m
+ CONFIG_AHCI_DWC=m
  CONFIG_AHCI_CEVA=y
  CONFIG_AHCI_MVEBU=y
  CONFIG_AHCI_XGENE=y
@@@ -375,6 -380,7 +380,7 @@@ CONFIG_AT803X_PHY=
  CONFIG_REALTEK_PHY=y
  CONFIG_ROCKCHIP_PHY=y
  CONFIG_DP83867_PHY=y
+ CONFIG_DP83869_PHY=m
  CONFIG_DP83TD510_PHY=y
  CONFIG_VITESSE_PHY=y
  CONFIG_CAN_FLEXCAN=m
@@@ -408,6 -414,7 +414,7 @@@ CONFIG_MWIFIEX=
  CONFIG_MWIFIEX_SDIO=m
  CONFIG_MWIFIEX_PCIE=m
  CONFIG_MT7921E=m
+ CONFIG_RSI_91X=m
  CONFIG_WL18XX=m
  CONFIG_WLCORE_SDIO=m
  CONFIG_WWAN=m
@@@ -427,11 -434,13 +434,13 @@@ CONFIG_TOUCHSCREEN_GOODIX=
  CONFIG_TOUCHSCREEN_ELAN=m
  CONFIG_TOUCHSCREEN_EDT_FT5X06=m
  CONFIG_INPUT_MISC=y
+ CONFIG_INPUT_BBNSM_PWRKEY=m
  CONFIG_INPUT_PM8941_PWRKEY=y
  CONFIG_INPUT_PM8XXX_VIBRATOR=m
  CONFIG_INPUT_TPS65219_PWRBUTTON=m
  CONFIG_INPUT_PWM_BEEPER=m
  CONFIG_INPUT_PWM_VIBRA=m
+ CONFIG_INPUT_RK805_PWRKEY=m
  CONFIG_INPUT_HISI_POWERKEY=y
  # CONFIG_SERIO_SERPORT is not set
  CONFIG_SERIO_AMBAKMI=y
@@@ -533,8 -542,10 +542,10 @@@ CONFIG_SPI_OMAP24XX=
  CONFIG_SPI_ORION=y
  CONFIG_SPI_PL022=y
  CONFIG_SPI_ROCKCHIP=y
+ CONFIG_SPI_ROCKCHIP_SFC=m
  CONFIG_SPI_RPCIF=m
  CONFIG_SPI_RSPI=m
+ CONFIG_SPI_RZV2M_CSI=m
  CONFIG_SPI_QCOM_QSPI=m
  CONFIG_SPI_QUP=y
  CONFIG_SPI_QCOM_GENI=m
@@@ -547,6 -558,7 +558,7 @@@ CONFIG_SPI_SPIDEV=
  CONFIG_SPMI=y
  CONFIG_SPMI_MTK_PMIF=m
  CONFIG_PINCTRL_MAX77620=y
+ CONFIG_PINCTRL_RK805=m
  CONFIG_PINCTRL_SINGLE=y
  CONFIG_PINCTRL_OWL=y
  CONFIG_PINCTRL_S700=y
@@@ -562,6 -574,7 +574,7 @@@ CONFIG_PINCTRL_IMX8ULP=
  CONFIG_PINCTRL_IMX93=y
  CONFIG_PINCTRL_MSM=y
  CONFIG_PINCTRL_IPQ8074=y
+ CONFIG_PINCTRL_IPQ5018=y
  CONFIG_PINCTRL_IPQ5332=y
  CONFIG_PINCTRL_IPQ6018=y
  CONFIG_PINCTRL_IPQ9574=y
@@@ -618,6 -631,7 +631,7 @@@ CONFIG_GPIO_PCA953X_IRQ=
  CONFIG_GPIO_BD9571MWV=m
  CONFIG_GPIO_MAX77620=y
  CONFIG_GPIO_SL28CPLD=m
+ CONFIG_GPIO_SYSCON=y
  CONFIG_POWER_RESET_MSM=y
  CONFIG_POWER_RESET_QCOM_PON=m
  CONFIG_POWER_RESET_XGENE=y
@@@ -630,6 -644,7 +644,7 @@@ CONFIG_BATTERY_MAX17042=
  CONFIG_CHARGER_MT6360=m
  CONFIG_CHARGER_BQ25890=m
  CONFIG_CHARGER_BQ25980=m
+ CONFIG_CHARGER_RK817=m
  CONFIG_SENSORS_ARM_SCMI=y
  CONFIG_SENSORS_ARM_SCPI=y
  CONFIG_SENSORS_GPIO_FAN=m
@@@ -648,6 -663,7 +663,7 @@@ CONFIG_THERMAL_EMULATION=
  CONFIG_IMX_SC_THERMAL=m
  CONFIG_IMX8MM_THERMAL=m
  CONFIG_QORIQ_THERMAL=m
+ CONFIG_K3_THERMAL=m
  CONFIG_SUN8I_THERMAL=y
  CONFIG_ROCKCHIP_THERMAL=m
  CONFIG_RCAR_THERMAL=y
@@@ -676,6 -692,7 +692,7 @@@ CONFIG_SUNXI_WATCHDOG=
  CONFIG_NPCM7XX_WATCHDOG=y
  CONFIG_IMX2_WDT=y
  CONFIG_IMX_SC_WDT=m
+ CONFIG_IMX7ULP_WDT=m
  CONFIG_QCOM_WDT=m
  CONFIG_MESON_GXBB_WATCHDOG=m
  CONFIG_MESON_WATCHDOG=m
@@@ -686,6 -703,7 +703,7 @@@ CONFIG_UNIPHIER_WATCHDOG=
  CONFIG_PM8916_WATCHDOG=m
  CONFIG_BCM2835_WDT=y
  CONFIG_BCM7038_WDT=m
+ CONFIG_K3_RTI_WATCHDOG=m
  CONFIG_MFD_ALTERA_SYSMGR=y
  CONFIG_MFD_BD9571MWV=y
  CONFIG_MFD_AXP20X_I2C=y
@@@ -731,6 -749,7 +749,7 @@@ CONFIG_REGULATOR_PWM=
  CONFIG_REGULATOR_QCOM_RPMH=y
  CONFIG_REGULATOR_QCOM_SMD_RPM=y
  CONFIG_REGULATOR_QCOM_SPMI=y
+ CONFIG_REGULATOR_RAA215300=y
  CONFIG_REGULATOR_RK808=y
  CONFIG_REGULATOR_S2MPS11=y
  CONFIG_REGULATOR_TPS65132=m
@@@ -739,6 -758,7 +758,7 @@@ CONFIG_REGULATOR_VCTRL=
  CONFIG_RC_CORE=m
  CONFIG_RC_DECODERS=y
  CONFIG_RC_DEVICES=y
+ CONFIG_IR_GPIO_CIR=m
  CONFIG_IR_MESON=m
  CONFIG_IR_SUNXI=m
  CONFIG_MEDIA_SUPPORT=m
@@@ -793,6 -813,7 +813,7 @@@ CONFIG_DRM_EXYNOS_DSI=
  CONFIG_DRM_EXYNOS_HDMI=y
  CONFIG_DRM_EXYNOS_MIC=y
  CONFIG_DRM_ROCKCHIP=m
+ CONFIG_ROCKCHIP_VOP2=y
  CONFIG_ROCKCHIP_ANALOGIX_DP=y
  CONFIG_ROCKCHIP_CDN_DP=y
  CONFIG_ROCKCHIP_DW_HDMI=y
@@@ -821,6 -842,7 +842,7 @@@ CONFIG_DRM_PANEL_VISIONOX_VTDR6130=
  CONFIG_DRM_LONTIUM_LT8912B=m
  CONFIG_DRM_LONTIUM_LT9611=m
  CONFIG_DRM_LONTIUM_LT9611UXC=m
+ CONFIG_DRM_ITE_IT66121=m
  CONFIG_DRM_NWL_MIPI_DSI=m
  CONFIG_DRM_PARADE_PS8640=m
  CONFIG_DRM_SII902X=m
@@@ -846,6 -868,7 +868,7 @@@ CONFIG_DRM_MEDIATEK=
  CONFIG_DRM_MEDIATEK_HDMI=m
  CONFIG_DRM_MXSFB=m
  CONFIG_DRM_MESON=m
+ CONFIG_DRM_IMX_LCDIF=m
  CONFIG_DRM_PL111=m
  CONFIG_DRM_LIMA=m
  CONFIG_DRM_PANFROST=m
@@@ -924,7 -947,9 +947,9 @@@ CONFIG_SND_SOC_GTM601=
  CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
  CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
  CONFIG_SND_SOC_PCM3168A_I2C=m
+ CONFIG_SND_SOC_RK817=m
  CONFIG_SND_SOC_RT5640=m
+ CONFIG_SND_SOC_J721E_EVM=m
  CONFIG_SND_SOC_RT5659=m
  CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
  CONFIG_SND_SOC_SIMPLE_MUX=m
@@@ -1046,10 -1071,13 +1071,13 @@@ CONFIG_MMC_SDHCI_XENON=
  CONFIG_MMC_SDHCI_AM654=y
  CONFIG_MMC_OWL=y
  CONFIG_SCSI_UFSHCD=y
+ CONFIG_SCSI_UFS_BSG=y
  CONFIG_SCSI_UFSHCD_PLATFORM=y
+ CONFIG_SCSI_UFS_CDNS_PLATFORM=m
  CONFIG_SCSI_UFS_QCOM=m
  CONFIG_SCSI_UFS_HISI=y
  CONFIG_SCSI_UFS_RENESAS=m
+ CONFIG_SCSI_UFS_TI_J721E=m
  CONFIG_SCSI_UFS_EXYNOS=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
@@@ -1074,6 -1102,7 +1102,7 @@@ CONFIG_RTC_DRV_DS1307=
  CONFIG_RTC_DRV_HYM8563=m
  CONFIG_RTC_DRV_MAX77686=y
  CONFIG_RTC_DRV_RK808=m
+ CONFIG_RTC_DRV_ISL1208=m
  CONFIG_RTC_DRV_PCF85063=m
  CONFIG_RTC_DRV_PCF85363=m
  CONFIG_RTC_DRV_M41T80=m
@@@ -1094,6 -1123,7 +1123,7 @@@ CONFIG_RTC_DRV_ARMADA38X=
  CONFIG_RTC_DRV_PM8XXX=m
  CONFIG_RTC_DRV_TEGRA=y
  CONFIG_RTC_DRV_SNVS=m
+ CONFIG_RTC_DRV_BBNSM=m
  CONFIG_RTC_DRV_IMX_SC=m
  CONFIG_RTC_DRV_MT6397=m
  CONFIG_RTC_DRV_XGENE=y
@@@ -1177,11 -1207,14 +1207,14 @@@ CONFIG_QCOM_CLK_SMD_RPM=
  CONFIG_QCOM_CLK_RPMH=y
  CONFIG_IPQ_APSS_6018=y
  CONFIG_IPQ_GCC_5332=y
+ CONFIG_IPQ_APSS_5018=y
+ CONFIG_IPQ_GCC_5018=y
  CONFIG_IPQ_GCC_6018=y
  CONFIG_IPQ_GCC_8074=y
  CONFIG_IPQ_GCC_9574=y
  CONFIG_MSM_GCC_8916=y
  CONFIG_MSM_GCC_8994=y
+ CONFIG_MSM_GCC_8996=y
  CONFIG_MSM_MMCC_8994=m
  CONFIG_MSM_MMCC_8996=m
  CONFIG_MSM_MMCC_8998=m
@@@ -1196,6 -1229,7 +1229,7 @@@ CONFIG_SC_GCC_7180=
  CONFIG_SC_GCC_7280=y
  CONFIG_SC_GCC_8180X=y
  CONFIG_SC_GCC_8280XP=y
+ CONFIG_SC_GPUCC_8280XP=m
  CONFIG_SC_LPASSCC_8280XP=m
  CONFIG_SDM_CAMCC_845=m
  CONFIG_SDM_GPUCC_845=y
@@@ -1225,6 -1259,7 +1259,7 @@@ CONFIG_TEGRA186_TIMER=
  CONFIG_RENESAS_OSTM=y
  CONFIG_ARM_MHU=y
  CONFIG_IMX_MBOX=y
+ CONFIG_OMAP2PLUS_MBOX=m
  CONFIG_PLATFORM_MHU=y
  CONFIG_BCM2835_MBOX=y
  CONFIG_QCOM_APCS_IPC=y
@@@ -1236,6 -1271,9 +1271,9 @@@ CONFIG_ARM_SMMU_V3=
  CONFIG_MTK_IOMMU=y
  CONFIG_QCOM_IOMMU=y
  CONFIG_REMOTEPROC=y
+ CONFIG_IMX_REMOTEPROC=y
+ CONFIG_TI_K3_R5_REMOTEPROC=m
+ CONFIG_TI_K3_DSP_REMOTEPROC=m
  CONFIG_MTK_SCP=m
  CONFIG_QCOM_Q6V5_ADSP=m
  CONFIG_QCOM_Q6V5_MSS=m
@@@ -1247,6 -1285,7 +1285,7 @@@ CONFIG_RPMSG_CTRL=
  CONFIG_RPMSG_QCOM_GLINK_RPM=y
  CONFIG_RPMSG_QCOM_GLINK_SMEM=m
  CONFIG_RPMSG_QCOM_SMD=y
+ CONFIG_RPMSG_VIRTIO=y
  CONFIG_SOUNDWIRE=m
  CONFIG_SOUNDWIRE_QCOM=m
  CONFIG_OWL_PM_DOMAINS=y
@@@ -1306,6 -1345,7 +1345,7 @@@ CONFIG_ARCH_TEGRA_186_SOC=
  CONFIG_ARCH_TEGRA_194_SOC=y
  CONFIG_ARCH_TEGRA_234_SOC=y
  CONFIG_TI_SCI_PM_DOMAINS=y
+ CONFIG_TI_PRUSS=m
  CONFIG_ARM_IMX_BUS_DEVFREQ=y
  CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
  CONFIG_ARM_MEDIATEK_CCI_DEVFREQ=m
@@@ -1344,10 -1384,12 +1384,12 @@@ CONFIG_PWM_MEDIATEK=
  CONFIG_PWM_RCAR=m
  CONFIG_PWM_RENESAS_TPU=m
  CONFIG_PWM_ROCKCHIP=y
+ CONFIG_PWM_RZ_MTU3=m
  CONFIG_PWM_SAMSUNG=y
  CONFIG_PWM_SL28CPLD=m
  CONFIG_PWM_SUN4I=m
  CONFIG_PWM_TEGRA=m
+ CONFIG_PWM_TIECAP=m
  CONFIG_PWM_TIEHRPWM=m
  CONFIG_PWM_VISCONTI=m
  CONFIG_SL28CPLD_INTC=y
@@@ -1380,6 -1422,7 +1422,7 @@@ CONFIG_PHY_QCOM_USB_HS=
  CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m
  CONFIG_PHY_QCOM_USB_HS_28NM=m
  CONFIG_PHY_QCOM_USB_SS=m
+ CONFIG_PHY_QCOM_SGMII_ETH=m
  CONFIG_PHY_R8A779F0_ETHERNET_SERDES=y
  CONFIG_PHY_RCAR_GEN3_PCIE=y
  CONFIG_PHY_RCAR_GEN3_USB2=y
@@@ -1388,7 -1431,9 +1431,9 @@@ CONFIG_PHY_ROCKCHIP_EMMC=
  CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
  CONFIG_PHY_ROCKCHIP_INNO_USB2=y
  CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
+ CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m
  CONFIG_PHY_ROCKCHIP_PCIE=m
+ CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
  CONFIG_PHY_ROCKCHIP_TYPEC=y
  CONFIG_PHY_SAMSUNG_UFS=y
  CONFIG_PHY_UNIPHIER_USB2=y
@@@ -1408,7 -1453,9 +1453,9 @@@ CONFIG_QCOM_L3_PMU=
  CONFIG_ARM_SPE_PMU=m
  CONFIG_ARM_DMC620_PMU=m
  CONFIG_HISI_PMU=y
+ CONFIG_NVMEM_LAYOUT_SL28_VPD=m
  CONFIG_NVMEM_IMX_OCOTP=y
+ CONFIG_NVMEM_IMX_OCOTP_ELE=m
  CONFIG_NVMEM_IMX_OCOTP_SCU=y
  CONFIG_NVMEM_LAYERSCAPE_SFP=m
  CONFIG_NVMEM_MESON_EFUSE=m
@@@ -1416,6 -1463,7 +1463,7 @@@ CONFIG_NVMEM_MTK_EFUSE=
  CONFIG_NVMEM_QCOM_QFPROM=y
  CONFIG_NVMEM_RMEM=m
  CONFIG_NVMEM_ROCKCHIP_EFUSE=y
+ CONFIG_NVMEM_ROCKCHIP_OTP=y
  CONFIG_NVMEM_SNVS_LPGPR=y
  CONFIG_NVMEM_SPMI_SDAM=m
  CONFIG_NVMEM_SUNXI_SID=y
@@@ -1429,6 -1477,7 +1477,7 @@@ CONFIG_FPGA_REGION=
  CONFIG_OF_FPGA_REGION=m
  CONFIG_TEE=y
  CONFIG_OPTEE=y
+ CONFIG_MUX_GPIO=m
  CONFIG_MUX_MMIO=y
  CONFIG_SLIMBUS=m
  CONFIG_SLIM_QCOM_CTRL=m
@@@ -1469,7 -1518,7 +1518,7 @@@ CONFIG_BTRFS_FS_POSIX_ACL=
  CONFIG_FANOTIFY=y
  CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
  CONFIG_QUOTA=y
 -CONFIG_AUTOFS4_FS=y
 +CONFIG_AUTOFS_FS=y
  CONFIG_FUSE_FS=m
  CONFIG_CUSE=m
  CONFIG_OVERLAY_FS=m