diff --git a/arch/arm64/configs/bananapi_m4berry_defconfig b/arch/arm64/configs/bananapi_m4berry_defconfig
index caf90cc19..d44e40446 100644
--- a/arch/arm64/configs/bananapi_m4berry_defconfig
+++ b/arch/arm64/configs/bananapi_m4berry_defconfig
@@ -4588,29 +4588,29 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHCI_FSL is not set
-CONFIG_USB_EHCI_HCD_SUNXI=m
+CONFIG_USB_EHCI_HCD_SUNXI=y
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_FOTG210_HCD is not set
 # CONFIG_USB_MAX3421_HCD is not set
 CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_SUNXI=m
+CONFIG_USB_OHCI_HCD_SUNXI=y
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
 # CONFIG_USB_U132_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_HCD_TEST_MODE is not set
-CONFIG_USB_SUNXI_HCD=m
-CONFIG_USB_SUNXI_HCI=m
-CONFIG_USB_SUNXI_EHCI0=m
-CONFIG_USB_SUNXI_EHCI1=m
-CONFIG_USB_SUNXI_EHCI2=m
-CONFIG_USB_SUNXI_EHCI3=m
-CONFIG_USB_SUNXI_OHCI0=m
-CONFIG_USB_SUNXI_OHCI1=m
-CONFIG_USB_SUNXI_OHCI2=m
-CONFIG_USB_SUNXI_OHCI3=m
+CONFIG_USB_SUNXI_HCD=y
+CONFIG_USB_SUNXI_HCI=y
+CONFIG_USB_SUNXI_EHCI0=y
+CONFIG_USB_SUNXI_EHCI1=y
+CONFIG_USB_SUNXI_EHCI2=y
+CONFIG_USB_SUNXI_EHCI3=y
+CONFIG_USB_SUNXI_OHCI0=y
+CONFIG_USB_SUNXI_OHCI1=y
+CONFIG_USB_SUNXI_OHCI2=y
+CONFIG_USB_SUNXI_OHCI3=y
 
 #
 # USB Device Class drivers
@@ -6327,9 +6327,15 @@ CONFIG_ARCH_HAS_KCOV=y
 #
 # Debug Lockups and Hangs
 #
-# CONFIG_SOFTLOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_WQ_WATCHDOG is not set
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1
+CONFIG_WQ_WATCHDOG=y
 # end of Debug Lockups and Hangs
 
 # CONFIG_PANIC_ON_OOPS is not set