arm64: kernel: Update kernel config with new options for Linux/arm64 5.10.42

Only change is the kernel config loaded into 5.10.42 "make menuconfig"
So obsolete config entries are removed and new options are added with its default

1 files changed, 43 insertions, 101 deletions

diff --git a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
index d4ee469b..fcb05622 100644
--- a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.23 Kernel Configuration
+# Linux/arm64 5.10.42 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
 CONFIG_CC_IS_GCC=y
@@ -47,7 +47,6 @@ CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
 CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
 CONFIG_GENERIC_IRQ_INJECTION=y
 CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_SIM=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
@@ -419,6 +418,7 @@ CONFIG_SETEND_EMULATION=y
 #
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_PAN=y
+CONFIG_AS_HAS_LSE_ATOMICS=y
 CONFIG_ARM64_LSE_ATOMICS=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM64_VHE=y
@@ -1772,6 +1772,9 @@ CONFIG_PCIE_BUS_DEFAULT=y
 # CONFIG_PCI_HOST_GENERIC is not set
 # CONFIG_PCIE_XILINX is not set
 # CONFIG_PCI_XGENE is not set
+CONFIG_PCIE_IPROC=y
+CONFIG_PCIE_IPROC_PLATFORM=y
+CONFIG_PCIE_IPROC_MSI=y
 # CONFIG_PCIE_ALTERA is not set
 # CONFIG_PCI_HOST_THUNDER_PEM is not set
 # CONFIG_PCI_HOST_THUNDER_ECAM is not set
@@ -1978,7 +1981,6 @@ CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
-CONFIG_OF_CONFIGFS=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
@@ -2021,7 +2023,6 @@ CONFIG_BLK_DEV_NVME=y
 #
 # Misc devices
 #
-CONFIG_BCM2835_SMI=m
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_PHANTOM is not set
@@ -2298,6 +2299,8 @@ CONFIG_BCMGENET=y
 # CONFIG_CNIC is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2X is not set
+CONFIG_BGMAC=y
+CONFIG_BGMAC_PLATFORM=y
 # CONFIG_SYSTEMPORT is not set
 # CONFIG_BNXT is not set
 CONFIG_NET_VENDOR_BROCADE=y
@@ -2485,6 +2488,7 @@ CONFIG_BROADCOM_PHY=y
 CONFIG_BCM7XXX_PHY=y
 # CONFIG_BCM84881_PHY is not set
 # CONFIG_BCM87XX_PHY is not set
+# CONFIG_BCM_CYGNUS_PHY is not set
 CONFIG_BCM_NET_PHYLIB=y
 # CONFIG_CICADA_PHY is not set
 # CONFIG_CORTINA_PHY is not set
@@ -2522,6 +2526,7 @@ CONFIG_MDIO_BUS=y
 CONFIG_OF_MDIO=y
 CONFIG_MDIO_DEVRES=y
 CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BCM_IPROC=y
 CONFIG_MDIO_BCM_UNIMAC=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
@@ -2535,6 +2540,8 @@ CONFIG_MDIO_BCM_UNIMAC=y
 #
 # MDIO Multiplexers
 #
+CONFIG_MDIO_BUS_MUX=y
+CONFIG_MDIO_BUS_MUX_BCM_IPROC=y
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
@@ -2914,7 +2921,6 @@ CONFIG_JOYSTICK_PSXPAD_SPI=m
 CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
 # CONFIG_JOYSTICK_PXRC is not set
 # CONFIG_JOYSTICK_FSIA6B is not set
-CONFIG_JOYSTICK_RPISENSE=m
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_PROPERTIES=y
@@ -2942,6 +2948,7 @@ CONFIG_TOUCHSCREEN_EXC3000=m
 CONFIG_TOUCHSCREEN_GOODIX=m
 # CONFIG_TOUCHSCREEN_HIDEEP is not set
 CONFIG_TOUCHSCREEN_ILI210X=m
+# CONFIG_TOUCHSCREEN_IPROC is not set
 # CONFIG_TOUCHSCREEN_S6SY761 is not set
 # CONFIG_TOUCHSCREEN_GUNZE is not set
 # CONFIG_TOUCHSCREEN_EKTF2127 is not set
@@ -3065,12 +3072,6 @@ CONFIG_GAMEPORT_L4=m
 #
 # Character devices
 #
-CONFIG_BRCM_CHAR_DRIVERS=y
-CONFIG_BCM2708_VCMEM=y
-CONFIG_BCM_VCIO=y
-CONFIG_BCM2835_DEVGPIOMEM=y
-CONFIG_BCM2835_SMI_DEV=m
-CONFIG_RPIVID_MEM=m
 CONFIG_TTY=y
 CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
@@ -3153,6 +3154,7 @@ CONFIG_TTY_PRINTK=y
 CONFIG_TTY_PRINTK_LEVEL=6
 # CONFIG_VIRTIO_CONSOLE is not set
 # CONFIG_IPMI_HANDLER is not set
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HW_RANDOM_BA431 is not set
@@ -3219,8 +3221,6 @@ CONFIG_I2C_ALGOBIT=m
 #
 # PC SMBus host controller drivers
 #
-CONFIG_I2C_BCM2708=m
-CONFIG_I2C_BCM2708_BAUDRATE=100000
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set
 # CONFIG_I2C_ALI15X3 is not set
@@ -3241,6 +3241,7 @@ CONFIG_I2C_BCM2708_BAUDRATE=100000
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 CONFIG_I2C_BCM2835=m
+CONFIG_I2C_BCM_IPROC=y
 CONFIG_I2C_BRCMSTB=m
 # CONFIG_I2C_CADENCE is not set
 # CONFIG_I2C_CBUS_GPIO is not set
@@ -3271,7 +3272,9 @@ CONFIG_I2C_TINY_USB=m
 # end of I2C Hardware Bus support
 
 # CONFIG_I2C_STUB is not set
-# CONFIG_I2C_SLAVE is not set
+CONFIG_I2C_SLAVE=y
+# CONFIG_I2C_SLAVE_EEPROM is not set
+# CONFIG_I2C_SLAVE_TESTUNIT is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -3290,6 +3293,7 @@ CONFIG_SPI_MEM=y
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
 CONFIG_SPI_BCM2835=m
 CONFIG_SPI_BCM2835AUX=m
+CONFIG_SPI_BCM_QSPI=y
 CONFIG_SPI_BITBANG=m
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_CADENCE_QUADSPI is not set
@@ -3364,6 +3368,8 @@ CONFIG_PINCTRL_MCP23S08=m
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_OCELOT is not set
 CONFIG_PINCTRL_BCM2835=y
+CONFIG_PINCTRL_IPROC_GPIO=y
+CONFIG_PINCTRL_NS2_MUX=y
 
 #
 # Renesas pinctrl drivers
@@ -3378,6 +3384,7 @@ CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_GENERIC=y
 
 #
 # Memory mapped GPIO drivers
@@ -3385,7 +3392,7 @@ CONFIG_GPIO_CDEV_V1=y
 # CONFIG_GPIO_74XX_MMIO is not set
 # CONFIG_GPIO_ALTERA is not set
 CONFIG_GPIO_RASPBERRYPI_EXP=y
-CONFIG_GPIO_BCM_VIRT=y
+CONFIG_GPIO_BCM_XGS_IPROC=y
 # CONFIG_GPIO_CADENCE is not set
 # CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_EXAR is not set
@@ -3423,7 +3430,6 @@ CONFIG_GPIO_PCF857X=m
 # MFD GPIO expanders
 #
 CONFIG_GPIO_ARIZONA=m
-CONFIG_GPIO_FSM=m
 CONFIG_GPIO_STMPE=y
 # end of MFD GPIO expanders
 
@@ -3643,7 +3649,6 @@ CONFIG_SENSORS_LM75=m
 # CONFIG_PMBUS is not set
 # CONFIG_SENSORS_PWM_FAN is not set
 CONFIG_SENSORS_RASPBERRYPI_HWMON=m
-CONFIG_SENSORS_RPI_POE_FAN=m
 # CONFIG_SENSORS_SHT15 is not set
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SHT3x=m
@@ -3711,6 +3716,8 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 #
 CONFIG_BCM2711_THERMAL=y
 CONFIG_BCM2835_THERMAL=y
+CONFIG_BCM_NS_THERMAL=y
+CONFIG_BCM_SR_THERMAL=y
 # end of Broadcom thermal drivers
 
 # CONFIG_GENERIC_ADC_THERMAL is not set
@@ -3781,7 +3788,6 @@ CONFIG_BCMA_DRIVER_PCI=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
-CONFIG_MFD_RPISENSE_CORE=m
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_MFD_AS3722 is not set
@@ -4273,7 +4279,6 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_VIDEO_ASPEED is not set
 # CONFIG_VIDEO_MUX is not set
 # CONFIG_VIDEO_XILINX is not set
-CONFIG_VIDEO_BCM2835_UNICAM=m
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 # CONFIG_DVB_PLATFORM_DRIVERS is not set
 # CONFIG_SDR_PLATFORM_DRIVERS is not set
@@ -4411,7 +4416,6 @@ CONFIG_VIDEO_IMX219=m
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
 CONFIG_VIDEO_IMX290=m
-CONFIG_VIDEO_IMX477=m
 # CONFIG_VIDEO_IMX319 is not set
 # CONFIG_VIDEO_IMX355 is not set
 # CONFIG_VIDEO_OV2640 is not set
@@ -4432,10 +4436,8 @@ CONFIG_VIDEO_OV7640=m
 # CONFIG_VIDEO_OV7740 is not set
 # CONFIG_VIDEO_OV8856 is not set
 # CONFIG_VIDEO_OV9640 is not set
-CONFIG_VIDEO_OV9281=m
 # CONFIG_VIDEO_OV9650 is not set
 # CONFIG_VIDEO_OV13858 is not set
-CONFIG_VIDEO_IRS1125=m
 # CONFIG_VIDEO_VS6624 is not set
 # CONFIG_VIDEO_MT9M001 is not set
 # CONFIG_VIDEO_MT9M032 is not set
@@ -4726,7 +4728,6 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_SCHED=m
 
 #
 # I2C encoder or helper chips
@@ -4851,7 +4852,6 @@ CONFIG_DRM_SIMPLE_BRIDGE=m
 # CONFIG_DRM_CDNS_MHDP8546 is not set
 # end of Display Interface Bridges
 
-CONFIG_DRM_V3D=m
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VC4_HDMI_CEC=y
 # CONFIG_DRM_ETNAVIV is not set
@@ -4899,7 +4899,6 @@ CONFIG_FB_MODE_HELPERS=y
 #
 # Frame buffer hardware drivers
 #
-CONFIG_FB_BCM2708=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_ARMCLCD is not set
@@ -4938,7 +4937,6 @@ CONFIG_FB_UDL=m
 CONFIG_FB_SIMPLE=y
 CONFIG_FB_SSD1307=m
 # CONFIG_FB_SM712 is not set
-CONFIG_FB_RPISENSE=m
 # end of Frame buffer Devices
 
 #
@@ -4948,7 +4946,6 @@ CONFIG_FB_RPISENSE=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
 # CONFIG_BACKLIGHT_KTD253 is not set
 # CONFIG_BACKLIGHT_PWM is not set
-CONFIG_BACKLIGHT_RPI=m
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
@@ -4994,7 +4991,6 @@ CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_SEQ_DEVICE=m
 CONFIG_SND_RAWMIDI=m
-CONFIG_SND_COMPRESS_OFFLOAD=m
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
 CONFIG_SND_OSSEMUL=y
@@ -5113,49 +5109,10 @@ CONFIG_SND_USB_HIFACE=m
 # CONFIG_SND_USB_VARIAX is not set
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
-CONFIG_SND_SOC_COMPRESS=y
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_ATMEL_SOC is not set
 CONFIG_SND_BCM2835_SOC_I2S=m
 # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
-CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m
-CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
-CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
-CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m
-CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
-CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
-CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
-CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
-CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
-CONFIG_SND_BCM2708_SOC_PIFI_40=m
-CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m
-CONFIG_SND_BCM2708_SOC_RPI_DAC=m
-CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
-CONFIG_SND_BCM2708_SOC_JUSTBOOM_BOTH=m
-CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m
-CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
-CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m
-CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
-CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m
-CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m
-CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m
-CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m
-CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m
-CONFIG_SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD=m
-CONFIG_SND_AUDIOSENSE_PI=m
-CONFIG_SND_DIGIDAC1_SOUNDCARD=m
-CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m
-CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
-CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
-CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m
-CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m
-CONFIG_SND_BCM2708_SOC_ALLO_BOSS2_DAC=m
-CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m
-CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m
-CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
-CONFIG_SND_PISOUND=m
-CONFIG_SND_RPI_SIMPLE_SOUNDCARD=m
-CONFIG_SND_RPI_WM8804_SOUNDCARD=m
 # CONFIG_SND_DESIGNWARE_I2S is not set
 
 #
@@ -5195,17 +5152,10 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 #
 # CODEC drivers
 #
-CONFIG_SND_SOC_ARIZONA=m
-CONFIG_SND_SOC_WM_ADSP=m
 # CONFIG_SND_SOC_AC97_CODEC is not set
-CONFIG_SND_SOC_AD193X=m
-CONFIG_SND_SOC_AD193X_SPI=m
-CONFIG_SND_SOC_AD193X_I2C=m
 CONFIG_SND_SOC_ADAU1701=m
 # CONFIG_SND_SOC_ADAU1761_I2C is not set
 # CONFIG_SND_SOC_ADAU1761_SPI is not set
-CONFIG_SND_SOC_ADAU1977=m
-CONFIG_SND_SOC_ADAU1977_I2C=m
 CONFIG_SND_SOC_ADAU7002=m
 # CONFIG_SND_SOC_ADAU7118_HW is not set
 # CONFIG_SND_SOC_ADAU7118_I2C is not set
@@ -5251,9 +5201,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_ES8328_I2C is not set
 # CONFIG_SND_SOC_ES8328_SPI is not set
 # CONFIG_SND_SOC_GTM601 is not set
-CONFIG_SND_SOC_ICS43432=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-CONFIG_SND_SOC_MA120X0P=m
 # CONFIG_SND_SOC_MAX98088 is not set
 CONFIG_SND_SOC_MAX98357A=m
 # CONFIG_SND_SOC_MAX98504 is not set
@@ -5275,13 +5223,11 @@ CONFIG_SND_SOC_PCM186X_I2C=m
 # CONFIG_SND_SOC_PCM3060_SPI is not set
 # CONFIG_SND_SOC_PCM3168A_I2C is not set
 # CONFIG_SND_SOC_PCM3168A_SPI is not set
-CONFIG_SND_SOC_PCM5102A=m
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
 # CONFIG_SND_SOC_PCM512x_SPI is not set
 # CONFIG_SND_SOC_RK3328 is not set
 # CONFIG_SND_SOC_RT5616 is not set
-CONFIG_SND_SOC_PCM1794A=m
 # CONFIG_SND_SOC_RT5631 is not set
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIGMADSP=m
@@ -5306,7 +5252,6 @@ CONFIG_SND_SOC_TAS571X=m
 # CONFIG_SND_SOC_TAS6424 is not set
 # CONFIG_SND_SOC_TDA7419 is not set
 # CONFIG_SND_SOC_TFA9879 is not set
-CONFIG_SND_SOC_TAS5713=m
 # CONFIG_SND_SOC_TLV320AIC23_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC23_SPI is not set
 # CONFIG_SND_SOC_TLV320AIC31XX is not set
@@ -5319,7 +5264,6 @@ CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
 # CONFIG_SND_SOC_TSCS42XX is not set
 # CONFIG_SND_SOC_TSCS454 is not set
 # CONFIG_SND_SOC_UDA1334 is not set
-CONFIG_SND_SOC_WM5102=m
 # CONFIG_SND_SOC_WM8510 is not set
 # CONFIG_SND_SOC_WM8523 is not set
 # CONFIG_SND_SOC_WM8524 is not set
@@ -5355,7 +5299,6 @@ CONFIG_SND_SOC_WM8804_I2C=m
 # CONFIG_SND_SOC_NAU8822 is not set
 # CONFIG_SND_SOC_NAU8824 is not set
 CONFIG_SND_SOC_TPA6130A2=m
-CONFIG_SND_SOC_I_SABRE_CODEC=m
 # end of CODEC drivers
 
 CONFIG_SND_SIMPLE_CARD_UTILS=m
@@ -5542,7 +5485,6 @@ CONFIG_USB_XHCI_PLATFORM=y
 # CONFIG_USB_U132_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
-CONFIG_USB_DWCOTG=y
 # CONFIG_USB_HCD_BCMA is not set
 # CONFIG_USB_HCD_SSB is not set
 # CONFIG_USB_HCD_TEST_MODE is not set
@@ -5811,7 +5753,7 @@ CONFIG_USB_G_WEBCAM=m
 # end of USB Gadget precomposed configurations
 
 # CONFIG_TYPEC is not set
-CONFIG_USB_ROLE_SWITCH=m
+CONFIG_USB_ROLE_SWITCH=y
 CONFIG_MMC=y
 CONFIG_PWRSEQ_EMMC=y
 # CONFIG_PWRSEQ_SD8787 is not set
@@ -5824,10 +5766,6 @@ CONFIG_MMC_BLOCK_MINORS=32
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
-CONFIG_MMC_BCM2835_MMC=y
-CONFIG_MMC_BCM2835_DMA=y
-CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_ARMMMCI is not set
 CONFIG_MMC_SDHCI=y
@@ -5929,12 +5867,10 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 #
 CONFIG_LEDS_TRIGGER_TRANSIENT=m
 CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_INPUT=y
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGER_NETDEV=m
 # CONFIG_LEDS_TRIGGER_PATTERN is not set
 # CONFIG_LEDS_TRIGGER_AUDIO is not set
-CONFIG_LEDS_TRIGGER_ACTPWR=y
 CONFIG_ACCESSIBILITY=y
 # CONFIG_A11Y_BRAILLE_CONSOLE is not set
 
@@ -6093,7 +6029,6 @@ CONFIG_DMA_BCM2835=y
 # CONFIG_MV_XOR_V2 is not set
 # CONFIG_PL330_DMA is not set
 # CONFIG_PLX_DMA is not set
-CONFIG_DMA_BCM2708=y
 # CONFIG_XILINX_DMA is not set
 # CONFIG_XILINX_ZYNQMP_DMA is not set
 # CONFIG_XILINX_ZYNQMP_DPDMA is not set
@@ -6143,6 +6078,7 @@ CONFIG_UIO_PDRV_GENIRQ=m
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_MF624 is not set
+# CONFIG_VFIO is not set
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_MENU=y
 # CONFIG_VIRTIO_PCI is not set
@@ -6233,7 +6169,6 @@ CONFIG_VT6656=m
 
 # CONFIG_FB_SM750 is not set
 CONFIG_STAGING_MEDIA=y
-CONFIG_VIDEO_RPIVID=m
 # CONFIG_VIDEO_ZORAN is not set
 
 #
@@ -6283,9 +6218,6 @@ CONFIG_BCM_VIDEOCORE=y
 CONFIG_BCM2835_VCHIQ=y
 CONFIG_SND_BCM2835=m
 CONFIG_VIDEO_BCM2835=m
-CONFIG_BCM_VC_SM_CMA=m
-CONFIG_VIDEO_CODEC_BCM2835=m
-CONFIG_VIDEO_ISP_BCM2835=m
 CONFIG_BCM2835_VCHIQ_MMAL=m
 # CONFIG_PI433 is not set
 
@@ -6308,8 +6240,6 @@ CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_MAX9485 is not set
-CONFIG_COMMON_CLK_HIFIBERRY_DACPLUSHD=m
-CONFIG_COMMON_CLK_HIFIBERRY_DACPRO=m
 # CONFIG_COMMON_CLK_SI5341 is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_SI514 is not set
@@ -6325,6 +6255,9 @@ CONFIG_COMMON_CLK_HIFIBERRY_DACPRO=m
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_CLK_BCM2711_DVP=y
 CONFIG_CLK_BCM2835=y
+CONFIG_COMMON_CLK_IPROC=y
+CONFIG_CLK_BCM_NS2=y
+CONFIG_CLK_BCM_SR=y
 CONFIG_CLK_RASPBERRYPI=y
 # CONFIG_HWSPINLOCK is not set
 
@@ -6351,6 +6284,8 @@ CONFIG_MAILBOX=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_BCM2835_MBOX=y
 # CONFIG_MAILBOX_TEST is not set
+# CONFIG_BCM_PDC_MBOX is not set
+CONFIG_BCM_FLEXRM_MBOX=m
 # CONFIG_IOMMU_SUPPORT is not set
 
 #
@@ -6501,8 +6436,8 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_AD7923 is not set
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
-# CONFIG_AD9467 is not set
 # CONFIG_ADI_AXI_ADC is not set
+# CONFIG_BCM_IPROC_ADC is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_HI8435 is not set
@@ -6890,6 +6825,7 @@ CONFIG_MAX31856=m
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_DEBUG is not set
+CONFIG_PWM_BCM_IPROC=y
 CONFIG_PWM_BCM2835=m
 # CONFIG_PWM_FSL_FTM is not set
 CONFIG_PWM_PCA9685=m
@@ -6906,7 +6842,6 @@ CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
 # CONFIG_AL_FIC is not set
-CONFIG_BRCMSTB_L2_IRQ=y
 CONFIG_PARTITION_PERCPU=y
 # end of IRQ chip support
 
@@ -6923,7 +6858,14 @@ CONFIG_RESET_SIMPLE=y
 #
 CONFIG_GENERIC_PHY=y
 # CONFIG_PHY_XGENE is not set
+CONFIG_PHY_BCM_SR_USB=y
 # CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_BCM_NS_USB2 is not set
+# CONFIG_PHY_BCM_NS_USB3 is not set
+CONFIG_PHY_NS2_PCIE=y
+CONFIG_PHY_NS2_USB_DRD=y
+CONFIG_PHY_BRCM_SATA=y
+CONFIG_PHY_BCM_SR_PCIE=y
 # CONFIG_PHY_CADENCE_TORRENT is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
 # CONFIG_PHY_CADENCE_SIERRA is not set
@@ -6950,7 +6892,6 @@ CONFIG_GENERIC_PHY=y
 CONFIG_ARM_PMU=y
 # CONFIG_ARM_DSU_PMU is not set
 # CONFIG_ARM_SPE_PMU is not set
-CONFIG_RPI_AXIPERF=m
 # end of Performance monitor support
 
 # CONFIG_RAS is not set
@@ -6966,7 +6907,7 @@ CONFIG_RPI_AXIPERF=m
 # CONFIG_DAX is not set
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_RMEM=m
+CONFIG_NVMEM_BCM_OCOTP=y
 
 #
 # HW tracing support
@@ -7069,6 +7010,7 @@ CONFIG_FS_ENCRYPTION_ALGS=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
+CONFIG_INOTIFY_STACKFS=y
 CONFIG_FANOTIFY=y
 # CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
 CONFIG_QUOTA=y
@@ -7217,7 +7159,7 @@ CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_PNFS_FILE_LAYOUT=y
 CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=y
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 # CONFIG_NFS_V4_1_MIGRATION is not set
 CONFIG_NFS_V4_SECURITY_LABEL=y