diff --git a/arch/arm/boot/dts/amlogic/meson-s1a.dtsi b/arch/arm/boot/dts/amlogic/meson-s1a.dtsi
index c1980a7ef..8c69625b1 100644
--- a/arch/arm/boot/dts/amlogic/meson-s1a.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson-s1a.dtsi
@@ -1104,8 +1104,8 @@
 			compatible = "amlogic,crypto_s4d";
 			dev_name = "aml_crypto_dev";
 			status = "okay";
-			thread = /bits/ 8 <0x5>;
-			interrupts = <0 29 1>;
+			thread = /bits/ 8 <0x1>;
+			interrupts = <0 25 1>;
 		};
 	};
 
diff --git a/arch/arm/configs/meson64_a32_zapper_defconfig b/arch/arm/configs/meson64_a32_zapper_defconfig
index 2b5e38d50..d147eb9e0 100644
--- a/arch/arm/configs/meson64_a32_zapper_defconfig
+++ b/arch/arm/configs/meson64_a32_zapper_defconfig
@@ -494,6 +494,7 @@ CONFIG_AMLOGIC_CRG=y
 CONFIG_AMLOGIC_USBPHY=y
 CONFIG_AMLOGIC_USB2PHY=y
 CONFIG_AMLOGIC_USB3PHY=y
+CONFIG_AMLOGIC_CRYPTO_DMA=y
 CONFIG_AMLOGIC_MTD_SPI_NAND=y
 CONFIG_AMLOGIC_MTD_COMMON=y
 CONFIG_AMLOGIC_MTD_RESV=y
@@ -525,7 +526,6 @@ CONFIG_STATIC_USERMODEHELPER=y
 CONFIG_STATIC_USERMODEHELPER_PATH=""
 CONFIG_LSM=""
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
-# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_HW is not set
diff --git a/arch/arm/configs/meson64_a32_zapper_ext_defconfig b/arch/arm/configs/meson64_a32_zapper_ext_defconfig
index 4bf1ac952..a75cdf0bc 100644
--- a/arch/arm/configs/meson64_a32_zapper_ext_defconfig
+++ b/arch/arm/configs/meson64_a32_zapper_ext_defconfig
@@ -188,3 +188,10 @@ CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
 CONFIG_UNICODE=y
 #CONFIG_BLK_DEV_BSG=y
+
+### AMLOGIC CRYPTO DRIVER TESTING
+CONFIG_CRYPTO_USER_API_HASH=y
+CONFIG_CRYPTO_USER_API_SKCIPHER=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_ECB=y
+# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set