a few dep fixes/cleanups post config cleanup

43 files changed, 139 insertions, 73 deletions

diff --git a/configs/fedora/generic/CONFIG_MPL115_I2C b/configs/fedora/generic/CONFIG_MPL115_I2C
index 627567714..27e4547ad 100644
--- a/configs/fedora/generic/CONFIG_MPL115_I2C
+++ b/configs/fedora/generic/CONFIG_MPL115_I2C
@@ -1 +1 @@
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115_I2C=m
diff --git a/configs/fedora/generic/CONFIG_NFC_MRVL_SPI b/configs/fedora/generic/CONFIG_NFC_MRVL_SPI
new file mode 100644
index 000000000..ef37ebfba
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NFC_MRVL_SPI
@@ -0,0 +1 @@
+# CONFIG_NFC_MRVL_SPI is not set
diff --git a/configs/fedora/generic/CONFIG_NFC_NCI_SPI b/configs/fedora/generic/CONFIG_NFC_NCI_SPI
index 231914c6a..7ec3f9c6a 100644
--- a/configs/fedora/generic/CONFIG_NFC_NCI_SPI
+++ b/configs/fedora/generic/CONFIG_NFC_NCI_SPI
@@ -1 +1 @@
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
diff --git a/configs/fedora/generic/arm/CONFIG_SPI_ZYNQMP_GQSPI b/configs/fedora/generic/CONFIG_SPI_ZYNQMP_GQSPI
index 48e520fd6..48e520fd6 100644
--- a/configs/fedora/generic/arm/CONFIG_SPI_ZYNQMP_GQSPI
+++ b/configs/fedora/generic/CONFIG_SPI_ZYNQMP_GQSPI
diff --git a/configs/fedora/generic/CONFIG_XFRM_INTERFACE b/configs/fedora/generic/CONFIG_XFRM_INTERFACE
index 63423b745..d808c272d 100644
--- a/configs/fedora/generic/CONFIG_XFRM_INTERFACE
+++ b/configs/fedora/generic/CONFIG_XFRM_INTERFACE
@@ -1 +1 @@
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
diff --git a/configs/fedora/generic/CONFIG_XFRM_OFFLOAD b/configs/fedora/generic/CONFIG_XFRM_OFFLOAD
new file mode 100644
index 000000000..37cb46a2f
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_XFRM_OFFLOAD
@@ -0,0 +1 @@
+CONFIG_XFRM_OFFLOAD=y
diff --git a/configs/fedora/generic/arm/CONFIG_LEDS_GPIO b/configs/fedora/generic/arm/CONFIG_LEDS_GPIO
deleted file mode 100644
index 65a807afb..000000000
--- a/configs/fedora/generic/arm/CONFIG_LEDS_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LEDS_GPIO=m
diff --git a/configs/fedora/generic/arm/CONFIG_PHY_QCOM_UFS_14NM b/configs/fedora/generic/arm/CONFIG_PHY_QCOM_UFS_14NM
new file mode 100644
index 000000000..e858b3441
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_PHY_QCOM_UFS_14NM
@@ -0,0 +1 @@
+CONFIG_PHY_QCOM_UFS_14NM=m
diff --git a/configs/fedora/generic/arm/CONFIG_SPI_MESON_SPICC b/configs/fedora/generic/arm/CONFIG_SPI_MESON_SPICC
index c78be8577..a5d7e7417 100644
--- a/configs/fedora/generic/arm/CONFIG_SPI_MESON_SPICC
+++ b/configs/fedora/generic/arm/CONFIG_SPI_MESON_SPICC
@@ -1 +1 @@
-# CONFIG_SPI_MESON_SPICC is not set
+CONFIG_SPI_MESON_SPICC=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_V4L_PLATFORM_DRIVERS b/configs/fedora/generic/arm/CONFIG_V4L_PLATFORM_DRIVERS
index ba1d871fc..ba1d871fc 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_V4L_PLATFORM_DRIVERS
+++ b/configs/fedora/generic/arm/CONFIG_V4L_PLATFORM_DRIVERS
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_VIDEO_MUX b/configs/fedora/generic/arm/CONFIG_VIDEO_MUX
index b01b0b424..b01b0b424 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_VIDEO_MUX
+++ b/configs/fedora/generic/arm/CONFIG_VIDEO_MUX
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_CCP_CRYPTO b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_CCP_CRYPTO
new file mode 100644
index 000000000..4887c6d76
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_CCP_CRYPTO
@@ -0,0 +1 @@
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_SP_CCP b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_SP_CCP
new file mode 100644
index 000000000..413ad9c2a
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_SP_CCP
@@ -0,0 +1 @@
+CONFIG_CRYPTO_DEV_SP_CCP=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_VIDEO_QCOM_CAMSS b/configs/fedora/generic/arm/aarch64/CONFIG_VIDEO_QCOM_CAMSS
new file mode 100644
index 000000000..5e2512c4c
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_VIDEO_QCOM_CAMSS
@@ -0,0 +1 @@
+CONFIG_VIDEO_QCOM_CAMSS=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MFD_ARIZONA_SPI b/configs/fedora/generic/arm/armv7/CONFIG_MFD_ARIZONA_SPI
deleted file mode 100644
index e3e9c6758..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MFD_ARIZONA_SPI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_ARIZONA_SPI is not set
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_NET_VENDOR_MICROCHIP b/configs/fedora/generic/arm/armv7/CONFIG_NET_VENDOR_MICROCHIP
deleted file mode 100644
index 8a7b69b77..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_NET_VENDOR_MICROCHIP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_MICROCHIP is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_AMX3_PM b/configs/fedora/generic/arm/armv7/armv7/CONFIG_AMX3_PM
new file mode 100644
index 000000000..717ba1a9f
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_AMX3_PM
@@ -0,0 +1 @@
+CONFIG_AMX3_PM=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_BACKLIGHT_TPS65217 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_BACKLIGHT_TPS65217
new file mode 100644
index 000000000..a07a30140
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_BACKLIGHT_TPS65217
@@ -0,0 +1 @@
+CONFIG_BACKLIGHT_TPS65217=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CHARGER_TPS65217 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CHARGER_TPS65217
new file mode 100644
index 000000000..e77c2fc05
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CHARGER_TPS65217
@@ -0,0 +1 @@
+CONFIG_CHARGER_TPS65217=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_TPS65217 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_TPS65217
new file mode 100644
index 000000000..750b318cd
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_TPS65217
@@ -0,0 +1 @@
+CONFIG_MFD_TPS65217=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_TPS65217 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_TPS65217
new file mode 100644
index 000000000..1843491ff
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_TPS65217
@@ -0,0 +1 @@
+CONFIG_REGULATOR_TPS65217=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SOC_TI b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SOC_TI
new file mode 100644
index 000000000..954d96c71
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SOC_TI
@@ -0,0 +1 @@
+CONFIG_SOC_TI=y
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_WKUP_M3_IPC b/configs/fedora/generic/arm/armv7/armv7/CONFIG_WKUP_M3_IPC
new file mode 100644
index 000000000..fa524826b
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_WKUP_M3_IPC
@@ -0,0 +1 @@
+CONFIG_WKUP_M3_IPC=m
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_ARCH_MXC b/configs/fedora/generic/arm/armv7/lpae/CONFIG_ARCH_MXC
deleted file mode 100644
index 6d6aca346..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_ARCH_MXC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARCH_MXC is not set
diff --git a/configs/fedora/generic/powerpc/CONFIG_GPIO_PCA953X b/configs/fedora/generic/powerpc/CONFIG_GPIO_PCA953X
deleted file mode 100644
index 15f1c9373..000000000
--- a/configs/fedora/generic/powerpc/CONFIG_GPIO_PCA953X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_PCA953X=m
diff --git a/configs/fedora/generic/s390x/CONFIG_FDDI b/configs/fedora/generic/s390x/CONFIG_FDDI
deleted file mode 100644
index e13f968a5..000000000
--- a/configs/fedora/generic/s390x/CONFIG_FDDI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FDDI is not set
diff --git a/configs/fedora/generic/x86/CONFIG_CRYPTO_DEV_CCP_CRYPTO b/configs/fedora/generic/x86/CONFIG_CRYPTO_DEV_CCP_CRYPTO
new file mode 100644
index 000000000..4887c6d76
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_CRYPTO_DEV_CCP_CRYPTO
@@ -0,0 +1 @@
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
diff --git a/configs/fedora/generic/x86/CONFIG_CRYPTO_DEV_SP_CCP b/configs/fedora/generic/x86/CONFIG_CRYPTO_DEV_SP_CCP
new file mode 100644
index 000000000..413ad9c2a
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_CRYPTO_DEV_SP_CCP
@@ -0,0 +1 @@
+CONFIG_CRYPTO_DEV_SP_CCP=y
diff --git a/configs/fedora/generic/x86/CONFIG_SPI_ZYNQMP_GQSPI b/configs/fedora/generic/x86/CONFIG_SPI_ZYNQMP_GQSPI
deleted file mode 100644
index 48e520fd6..000000000
--- a/configs/fedora/generic/x86/CONFIG_SPI_ZYNQMP_GQSPI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 70925c5c8..64d751925 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1070,6 +1070,7 @@ CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCREE=m
@@ -1084,7 +1085,7 @@ CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
-# CONFIG_CRYPTO_DEV_SP_CCP is not set
+CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
@@ -3384,7 +3385,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115_I2C=m
 # CONFIG_MPL115_SPI is not set
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
@@ -3814,9 +3815,10 @@ CONFIG_NFC_MICROREAD_I2C=m
 CONFIG_NFC_MICROREAD=m
 # CONFIG_NFC_MRVL_I2C is not set
 CONFIG_NFC_MRVL=m
+# CONFIG_NFC_MRVL_SPI is not set
 CONFIG_NFC_MRVL_USB=m
 CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
 # CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_NXP_NCI=m
@@ -4260,6 +4262,7 @@ CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
 CONFIG_PHY_QCOM_QMP=m
 CONFIG_PHY_QCOM_QUSB2=m
+CONFIG_PHY_QCOM_UFS_14NM=m
 CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS=m
@@ -5765,7 +5768,7 @@ CONFIG_SPI_GPIO=m
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
-# CONFIG_SPI_MESON_SPICC is not set
+CONFIG_SPI_MESON_SPICC=m
 CONFIG_SPI_MESON_SPIFC=m
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_OC_TINY is not set
@@ -6620,7 +6623,7 @@ CONFIG_UWB=m
 CONFIG_UWB_WHCI=m
 # CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
+CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_V4L_TEST_DRIVERS is not set
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
@@ -6701,11 +6704,13 @@ CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MESON_AO_CEC=m
 CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_QCOM_CAMSS=m
 CONFIG_VIDEO_QCOM_VENUS=m
 CONFIG_VIDEO_ROCKCHIP_RGA=m
 CONFIG_VIDEO_ROCKCHIP_VPU=m
@@ -6879,8 +6884,9 @@ CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index b37dea1f0..b9ac1ab8e 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1070,6 +1070,7 @@ CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCREE=m
@@ -1084,7 +1085,7 @@ CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
-# CONFIG_CRYPTO_DEV_SP_CCP is not set
+CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
@@ -3364,7 +3365,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115_I2C=m
 # CONFIG_MPL115_SPI is not set
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
@@ -3794,9 +3795,10 @@ CONFIG_NFC_MICROREAD_I2C=m
 CONFIG_NFC_MICROREAD=m
 # CONFIG_NFC_MRVL_I2C is not set
 CONFIG_NFC_MRVL=m
+# CONFIG_NFC_MRVL_SPI is not set
 CONFIG_NFC_MRVL_USB=m
 CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
 # CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_NXP_NCI=m
@@ -4240,6 +4242,7 @@ CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
 CONFIG_PHY_QCOM_QMP=m
 CONFIG_PHY_QCOM_QUSB2=m
+CONFIG_PHY_QCOM_UFS_14NM=m
 CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS=m
@@ -5743,7 +5746,7 @@ CONFIG_SPI_GPIO=m
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
-# CONFIG_SPI_MESON_SPICC is not set
+CONFIG_SPI_MESON_SPICC=m
 CONFIG_SPI_MESON_SPIFC=m
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_OC_TINY is not set
@@ -6598,7 +6601,7 @@ CONFIG_UWB=m
 CONFIG_UWB_WHCI=m
 # CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
+CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_V4L_TEST_DRIVERS is not set
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
@@ -6679,11 +6682,13 @@ CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MESON_AO_CEC=m
 CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_QCOM_CAMSS=m
 CONFIG_VIDEO_QCOM_VENUS=m
 CONFIG_VIDEO_ROCKCHIP_RGA=m
 CONFIG_VIDEO_ROCKCHIP_VPU=m
@@ -6857,8 +6862,9 @@ CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index faf31e4e1..0a318bfee 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -170,6 +170,7 @@ CONFIG_AMD_PHY=m
 # CONFIG_AMD_XGBE_DCB is not set
 # CONFIG_AMD_XGBE is not set
 CONFIG_AMIGA_PARTITION=y
+CONFIG_AMX3_PM=m
 # CONFIG_ANDROID is not set
 # CONFIG_APDS9300 is not set
 CONFIG_APDS9802ALS=m
@@ -507,6 +508,7 @@ CONFIG_BACKLIGHT_PANDORA=m
 # CONFIG_BACKLIGHT_PM8941_WLED is not set
 CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_SAHARA is not set
+CONFIG_BACKLIGHT_TPS65217=m
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_BATMAN_ADV_BATMAN_V=y
@@ -884,6 +886,7 @@ CONFIG_CHARGER_QCOM_SMBB=m
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
 CONFIG_CHARGER_TPS65090=m
+CONFIG_CHARGER_TPS65217=m
 CONFIG_CHARGER_TWL4030=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
@@ -3343,7 +3346,7 @@ CONFIG_MFD_TI_LMU=m
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
 CONFIG_MFD_TPS65090=y
-# CONFIG_MFD_TPS65217 is not set
+CONFIG_MFD_TPS65217=m
 CONFIG_MFD_TPS65218=m
 CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_TPS65910=y
@@ -3527,7 +3530,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115_I2C=m
 # CONFIG_MPL115_SPI is not set
 CONFIG_MPL3115=m
 CONFIG_MPLS_IPTUNNEL=m
@@ -3979,9 +3982,10 @@ CONFIG_NFC_MICROREAD_I2C=m
 CONFIG_NFC_MICROREAD=m
 # CONFIG_NFC_MRVL_I2C is not set
 CONFIG_NFC_MRVL=m
+# CONFIG_NFC_MRVL_SPI is not set
 CONFIG_NFC_MRVL_USB=m
 CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
 # CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_NXP_NCI=m
@@ -4459,6 +4463,7 @@ CONFIG_PHY_QCOM_APQ8064_SATA=m
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
 CONFIG_PHY_QCOM_QMP=m
 CONFIG_PHY_QCOM_QUSB2=m
+CONFIG_PHY_QCOM_UFS_14NM=m
 CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS=m
@@ -4878,6 +4883,7 @@ CONFIG_REGULATOR_TPS65023=m
 CONFIG_REGULATOR_TPS6507X=m
 CONFIG_REGULATOR_TPS65090=m
 # CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TPS65218=m
 CONFIG_REGULATOR_TPS6524X=m
 CONFIG_REGULATOR_TPS6586X=m
@@ -6053,7 +6059,7 @@ CONFIG_SOC_STIH407=y
 # CONFIG_SOC_STIH416 is not set
 CONFIG_SOC_TEGRA_FLOWCTRL=y
 CONFIG_SOC_TI81XX=y
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
 # CONFIG_SOC_VF610 is not set
 CONFIG_SOFTLOCKUP_DETECTOR=y
 CONFIG_SOFT_WATCHDOG=m
@@ -6092,7 +6098,7 @@ CONFIG_SPI_IMX=m
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
-# CONFIG_SPI_MESON_SPICC is not set
+CONFIG_SPI_MESON_SPICC=m
 CONFIG_SPI_MESON_SPIFC=m
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_OC_TINY is not set
@@ -7255,6 +7261,7 @@ CONFIG_WIZNET_BUS_ANY=y
 CONFIG_WIZNET_W5100=m
 CONFIG_WIZNET_W5100_SPI=m
 CONFIG_WIZNET_W5300=m
+CONFIG_WKUP_M3_IPC=m
 CONFIG_WKUP_M3_RPROC=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SDIO=m
@@ -7292,8 +7299,9 @@ CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index c542cfcbc..0ce99e3ff 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3376,7 +3376,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115_I2C=m
 # CONFIG_MPL115_SPI is not set
 CONFIG_MPL3115=m
 CONFIG_MPLS_IPTUNNEL=m
@@ -3812,9 +3812,10 @@ CONFIG_NFC_MICROREAD_I2C=m
 CONFIG_NFC_MICROREAD=m
 # CONFIG_NFC_MRVL_I2C is not set
 CONFIG_NFC_MRVL=m
+# CONFIG_NFC_MRVL_SPI is not set
 CONFIG_NFC_MRVL_USB=m
 CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
 # CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_NXP_NCI=m
@@ -4251,6 +4252,7 @@ CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+CONFIG_PHY_QCOM_UFS_14NM=m
 CONFIG_PHY_QCOM_UFS=m
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
@@ -5731,7 +5733,7 @@ CONFIG_SPI_GPIO=m
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
-# CONFIG_SPI_MESON_SPICC is not set
+CONFIG_SPI_MESON_SPICC=m
 CONFIG_SPI_MESON_SPIFC=m
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_OC_TINY is not set
@@ -6591,7 +6593,7 @@ CONFIG_UWB=m
 CONFIG_UWB_WHCI=m
 # CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
+CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_V4L_TEST_DRIVERS is not set
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
@@ -6863,8 +6865,9 @@ CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index cd4136152..a728c9c71 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3357,7 +3357,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115_I2C=m
 # CONFIG_MPL115_SPI is not set
 CONFIG_MPL3115=m
 CONFIG_MPLS_IPTUNNEL=m
@@ -3793,9 +3793,10 @@ CONFIG_NFC_MICROREAD_I2C=m
 CONFIG_NFC_MICROREAD=m
 # CONFIG_NFC_MRVL_I2C is not set
 CONFIG_NFC_MRVL=m
+# CONFIG_NFC_MRVL_SPI is not set
 CONFIG_NFC_MRVL_USB=m
 CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
 # CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_NXP_NCI=m
@@ -4232,6 +4233,7 @@ CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+CONFIG_PHY_QCOM_UFS_14NM=m
 CONFIG_PHY_QCOM_UFS=m
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
@@ -5710,7 +5712,7 @@ CONFIG_SPI_GPIO=m
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
-# CONFIG_SPI_MESON_SPICC is not set
+CONFIG_SPI_MESON_SPICC=m
 CONFIG_SPI_MESON_SPIFC=m
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_OC_TINY is not set
@@ -6570,7 +6572,7 @@ CONFIG_UWB=m
 CONFIG_UWB_WHCI=m
 # CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
+CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_V4L_TEST_DRIVERS is not set
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
@@ -6842,8 +6844,9 @@ CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 608039bf8..96990b643 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -170,6 +170,7 @@ CONFIG_AMD_PHY=m
 # CONFIG_AMD_XGBE_DCB is not set
 # CONFIG_AMD_XGBE is not set
 CONFIG_AMIGA_PARTITION=y
+CONFIG_AMX3_PM=m
 # CONFIG_ANDROID is not set
 # CONFIG_APDS9300 is not set
 CONFIG_APDS9802ALS=m
@@ -507,6 +508,7 @@ CONFIG_BACKLIGHT_PANDORA=m
 # CONFIG_BACKLIGHT_PM8941_WLED is not set
 CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_SAHARA is not set
+CONFIG_BACKLIGHT_TPS65217=m
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_BATMAN_ADV_BATMAN_V=y
@@ -884,6 +886,7 @@ CONFIG_CHARGER_QCOM_SMBB=m
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
 CONFIG_CHARGER_TPS65090=m
+CONFIG_CHARGER_TPS65217=m
 CONFIG_CHARGER_TWL4030=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
@@ -3325,7 +3328,7 @@ CONFIG_MFD_TI_LMU=m
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
 CONFIG_MFD_TPS65090=y
-# CONFIG_MFD_TPS65217 is not set
+CONFIG_MFD_TPS65217=m
 CONFIG_MFD_TPS65218=m
 CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_TPS65910=y
@@ -3508,7 +3511,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115_I2C=m
 # CONFIG_MPL115_SPI is not set
 CONFIG_MPL3115=m
 CONFIG_MPLS_IPTUNNEL=m
@@ -3960,9 +3963,10 @@ CONFIG_NFC_MICROREAD_I2C=m
 CONFIG_NFC_MICROREAD=m
 # CONFIG_NFC_MRVL_I2C is not set
 CONFIG_NFC_MRVL=m
+# CONFIG_NFC_MRVL_SPI is not set
 CONFIG_NFC_MRVL_USB=m
 CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
 # CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_NXP_NCI=m
@@ -4440,6 +4444,7 @@ CONFIG_PHY_QCOM_APQ8064_SATA=m
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
 CONFIG_PHY_QCOM_QMP=m
 CONFIG_PHY_QCOM_QUSB2=m
+CONFIG_PHY_QCOM_UFS_14NM=m
 CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS=m
@@ -4858,6 +4863,7 @@ CONFIG_REGULATOR_TPS65023=m
 CONFIG_REGULATOR_TPS6507X=m
 CONFIG_REGULATOR_TPS65090=m
 # CONFIG_REGULATOR_TPS65132 is not set
+CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TPS65218=m
 CONFIG_REGULATOR_TPS6524X=m
 CONFIG_REGULATOR_TPS6586X=m
@@ -6032,7 +6038,7 @@ CONFIG_SOC_STIH407=y
 # CONFIG_SOC_STIH416 is not set
 CONFIG_SOC_TEGRA_FLOWCTRL=y
 CONFIG_SOC_TI81XX=y
-# CONFIG_SOC_TI is not set
+CONFIG_SOC_TI=y
 # CONFIG_SOC_VF610 is not set
 CONFIG_SOFTLOCKUP_DETECTOR=y
 CONFIG_SOFT_WATCHDOG=m
@@ -6071,7 +6077,7 @@ CONFIG_SPI_IMX=m
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
-# CONFIG_SPI_MESON_SPICC is not set
+CONFIG_SPI_MESON_SPICC=m
 CONFIG_SPI_MESON_SPIFC=m
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_OC_TINY is not set
@@ -7234,6 +7240,7 @@ CONFIG_WIZNET_BUS_ANY=y
 CONFIG_WIZNET_W5100=m
 CONFIG_WIZNET_W5100_SPI=m
 CONFIG_WIZNET_W5300=m
+CONFIG_WKUP_M3_IPC=m
 CONFIG_WKUP_M3_RPROC=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SDIO=m
@@ -7271,8 +7278,9 @@ CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 241cb44a9..cb028094a 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -894,6 +894,7 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP=y
 # CONFIG_CRYPTO_DEV_CCREE is not set
@@ -913,7 +914,7 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-# CONFIG_CRYPTO_DEV_SP_CCP is not set
+CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
@@ -3215,7 +3216,7 @@ CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MPENTIUMII is not set
 # CONFIG_MPENTIUMM is not set
 CONFIG_MPILIB=y
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115_I2C=m
 # CONFIG_MPL115_SPI is not set
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
@@ -3623,9 +3624,10 @@ CONFIG_NFC_MICROREAD=m
 CONFIG_NFC_MICROREAD_MEI=m
 # CONFIG_NFC_MRVL_I2C is not set
 CONFIG_NFC_MRVL=m
+# CONFIG_NFC_MRVL_SPI is not set
 CONFIG_NFC_MRVL_USB=m
 CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
 # CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_NXP_NCI=m
@@ -6456,8 +6458,9 @@ CONFIG_XEN_SELFBALLOONING=y
 CONFIG_XEN_SYMS=y
 CONFIG_XEN_WDT=m
 CONFIG_XEN=y
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 163cc79ab..234b1d93d 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -893,6 +893,7 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP=y
 # CONFIG_CRYPTO_DEV_CCREE is not set
@@ -912,7 +913,7 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-# CONFIG_CRYPTO_DEV_SP_CCP is not set
+CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
@@ -3196,7 +3197,7 @@ CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MPENTIUMII is not set
 # CONFIG_MPENTIUMM is not set
 CONFIG_MPILIB=y
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115_I2C=m
 # CONFIG_MPL115_SPI is not set
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
@@ -3604,9 +3605,10 @@ CONFIG_NFC_MICROREAD=m
 CONFIG_NFC_MICROREAD_MEI=m
 # CONFIG_NFC_MRVL_I2C is not set
 CONFIG_NFC_MRVL=m
+# CONFIG_NFC_MRVL_SPI is not set
 CONFIG_NFC_MRVL_USB=m
 CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
 # CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_NXP_NCI=m
@@ -6435,8 +6437,9 @@ CONFIG_XEN_SELFBALLOONING=y
 CONFIG_XEN_SYMS=y
 CONFIG_XEN_WDT=m
 CONFIG_XEN=y
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index f2991ea56..315e678d7 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2952,7 +2952,7 @@ CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
 # CONFIG_MPIC_MSGR is not set
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115_I2C=m
 # CONFIG_MPL115_SPI is not set
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
@@ -3350,9 +3350,10 @@ CONFIG_NFC_MICROREAD_I2C=m
 CONFIG_NFC_MICROREAD=m
 # CONFIG_NFC_MRVL_I2C is not set
 CONFIG_NFC_MRVL=m
+# CONFIG_NFC_MRVL_SPI is not set
 CONFIG_NFC_MRVL_USB=m
 CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
 # CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_NXP_NCI=m
@@ -5034,6 +5035,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
 # CONFIG_SPMI is not set
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
@@ -5997,8 +5999,9 @@ CONFIG_X86_PTDUMP=y
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index d910dccd4..e9c8b0a15 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2931,7 +2931,7 @@ CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
 # CONFIG_MPIC_MSGR is not set
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115_I2C=m
 # CONFIG_MPL115_SPI is not set
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
@@ -3329,9 +3329,10 @@ CONFIG_NFC_MICROREAD_I2C=m
 CONFIG_NFC_MICROREAD=m
 # CONFIG_NFC_MRVL_I2C is not set
 CONFIG_NFC_MRVL=m
+# CONFIG_NFC_MRVL_SPI is not set
 CONFIG_NFC_MRVL_USB=m
 CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
 # CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_NXP_NCI=m
@@ -5011,6 +5012,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
 # CONFIG_SPMI is not set
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
@@ -5974,8 +5976,9 @@ CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 1a3fc958d..53a7647c1 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2929,7 +2929,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115_I2C=m
 # CONFIG_MPL115_SPI is not set
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
@@ -3323,9 +3323,10 @@ CONFIG_NFC_MICROREAD_I2C=m
 CONFIG_NFC_MICROREAD=m
 # CONFIG_NFC_MRVL_I2C is not set
 CONFIG_NFC_MRVL=m
+# CONFIG_NFC_MRVL_SPI is not set
 CONFIG_NFC_MRVL_USB=m
 CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
 # CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_NXP_NCI=m
@@ -4977,6 +4978,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
 # CONFIG_SPMI is not set
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
@@ -5942,8 +5944,9 @@ CONFIG_X86_PTDUMP=y
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index e12743575..b8f5602f9 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2908,7 +2908,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115_I2C=m
 # CONFIG_MPL115_SPI is not set
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
@@ -3302,9 +3302,10 @@ CONFIG_NFC_MICROREAD_I2C=m
 CONFIG_NFC_MICROREAD=m
 # CONFIG_NFC_MRVL_I2C is not set
 CONFIG_NFC_MRVL=m
+# CONFIG_NFC_MRVL_SPI is not set
 CONFIG_NFC_MRVL_USB=m
 CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
 # CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_NXP_NCI=m
@@ -4954,6 +4955,7 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
 # CONFIG_SPMI is not set
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
@@ -5919,8 +5921,9 @@ CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 2f6896099..c65253e05 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -920,6 +920,7 @@ CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES3_EDE_X86_64=m
 CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP=y
 # CONFIG_CRYPTO_DEV_CCREE is not set
@@ -938,7 +939,7 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-# CONFIG_CRYPTO_DEV_SP_CCP is not set
+CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
@@ -3251,7 +3252,7 @@ CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
 CONFIG_MPILIB=y
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115_I2C=m
 # CONFIG_MPL115_SPI is not set
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
@@ -3656,9 +3657,10 @@ CONFIG_NFC_MICROREAD=m
 CONFIG_NFC_MICROREAD_MEI=m
 # CONFIG_NFC_MRVL_I2C is not set
 CONFIG_NFC_MRVL=m
+# CONFIG_NFC_MRVL_SPI is not set
 CONFIG_NFC_MRVL_USB=m
 CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
 # CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_NXP_NCI=m
@@ -6497,8 +6499,9 @@ CONFIG_XEN_SYMS=y
 CONFIG_XEN_SYS_HYPERVISOR=y
 CONFIG_XEN_WDT=m
 CONFIG_XEN=y
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 2927033bb..7bda3f829 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -919,6 +919,7 @@ CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES3_EDE_X86_64=m
 CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP=y
 # CONFIG_CRYPTO_DEV_CCREE is not set
@@ -937,7 +938,7 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-# CONFIG_CRYPTO_DEV_SP_CCP is not set
+CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
@@ -3232,7 +3233,7 @@ CONFIG_MOUSE_VSXXXAA=m
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
 CONFIG_MPILIB=y
-# CONFIG_MPL115_I2C is not set
+CONFIG_MPL115_I2C=m
 # CONFIG_MPL115_SPI is not set
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
@@ -3637,9 +3638,10 @@ CONFIG_NFC_MICROREAD=m
 CONFIG_NFC_MICROREAD_MEI=m
 # CONFIG_NFC_MRVL_I2C is not set
 CONFIG_NFC_MRVL=m
+# CONFIG_NFC_MRVL_SPI is not set
 CONFIG_NFC_MRVL_USB=m
 CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_NCI_SPI=m
 # CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_NXP_NCI=m
@@ -6476,8 +6478,9 @@ CONFIG_XEN_SYMS=y
 CONFIG_XEN_SYS_HYPERVISOR=y
 CONFIG_XEN_WDT=m
 CONFIG_XEN=y
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y