@@ -418,4 +418,95 @@ config CRYPTO_DEV_MXS_DCP
 	  To compile this driver as a module, choose M here: the module
 	  will be called mxs-dcp.
 
+config CRYPTO_DEV_SUNXI_SS
+	tristate "Support for Allwinner Security System cryptographic accelerator"
+	depends on ARCH_SUNXI
+	help
+	  Some Allwinner SoC have a crypto accelerator named
+	  Security System. Select this if you want to use it.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sunxi-ss.
+
+if CRYPTO_DEV_SUNXI_SS
+config CRYPTO_DEV_SUNXI_SS_PRNG
+	tristate "Security System PRNG"
+	select CRYPTO_RNG2
+	help
+	  If you enable this option, the SS will provide a pseudo random
+	  number generator.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sunxi-ss-prng.
+
+config CRYPTO_DEV_SUNXI_SS_HASH
+	tristate "Security System hash common"
+	help
+	  Common parts of Security System shared by hash algorithms.
+
+config CRYPTO_DEV_SUNXI_SS_CIPHER
+	tristate "Security System cipher common"
+	help
+	  Common parts of Security System shared by cipher algorithms.
+
+config CRYPTO_DEV_SUNXI_SS_MD5
+	tristate "Security System MD5"
+	select CRYPTO_MD5
+	select CRYPTO_DEV_SUNXI_SS_HASH
+	help
+	  If you enable this option, the SS will provide MD5 hardware
+	  acceleration.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sunxi-ss-md5.
+
+config CRYPTO_DEV_SUNXI_SS_SHA1
+	tristate "Security System SHA1"
+	select CRYPTO_SHA1
+	select CRYPTO_DEV_SUNXI_SS_HASH
+	help
+	  If you enable this option, the SS will provide SHA1 hardware
+	  acceleration.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sunxi-ss-sha1.
+
+config CRYPTO_DEV_SUNXI_SS_AES
+	tristate "Security System AES"
+	select CRYPTO_AES
+	select CRYPTO_BLKCIPHER
+	select CRYPTO_DEV_SUNXI_SS_CIPHER
+	help
+	  If you enable this option, the SS will provide AES hardware
+	  acceleration.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sunxi-ss-aes.
+
+config CRYPTO_DEV_SUNXI_SS_DES
+	tristate "Security System DES"
+	select CRYPTO_DES
+	select CRYPTO_BLKCIPHER
+	select CRYPTO_DEV_SUNXI_SS_CIPHER
+	help
+	  If you enable this option, the SS will provide DES hardware
+	  acceleration.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sunxi-ss-des.
+
+config CRYPTO_DEV_SUNXI_SS_3DES
+	tristate "Security System 3DES"
+	select CRYPTO_DES
+	select CRYPTO_BLKCIPHER
+	select CRYPTO_DEV_SUNXI_SS_CIPHER
+	help
+	  If you enable this option, the SS will provide 3DES hardware
+	  acceleration.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sunxi-ss-3des.
+
+endif #CRYPTO_DEV_SUNXI_SS
+
 endif # CRYPTO_HW

@@ -23,3 +23,4 @@ obj-$(CONFIG_CRYPTO_DEV_S5P) += s5p-sss.o
 obj-$(CONFIG_CRYPTO_DEV_SAHARA) += sahara.o
 obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o
 obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/
+obj-$(CONFIG_CRYPTO_DEV_SUNXI_SS) += sunxi-ss/