crypto: cavium - Enable CPT options crypto for build

Add the CPT options in crypto Kconfig and update the
crypto Makefile

Update the MAINTAINERS file too.

Signed-off-by: George Cherian <george.cherian@cavium.com>
Reviewed-by: David Daney <david.daney@cavium.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/MAINTAINERS b/MAINTAINERS
index 5f0420a0da5b674b314718fa5393201aa61815b7..4745b0a5480953337328ccfa211a722405dc8931 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2996,6 +2996,13 @@ W:     http://www.cavium.com
 S:     Supported
 F:     drivers/net/ethernet/cavium/liquidio/
 
+CAVIUM OCTEON-TX CRYPTO DRIVER
+M:     George Cherian <george.cherian@cavium.com>
+L:     linux-crypto@vger.kernel.org
+W:     http://www.cavium.com
+S:     Supported
+F:     drivers/crypto/cavium/cpt/
+
 CC2520 IEEE-802.15.4 RADIO DRIVER
 M:     Varka Bhadram <varkabhadram@gmail.com>
 L:     linux-wpan@vger.kernel.org

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index f60de152a90dd2579f4a44659bf913035f3f75e5..9c2760f69226e8e696c89e38e85e8c44f15a8d6d 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -497,6 +497,7 @@ config CRYPTO_DEV_MXS_DCP
          will be called mxs-dcp.
 
 source "drivers/crypto/qat/Kconfig"
+source "drivers/crypto/cavium/cpt/Kconfig"
 
 config CRYPTO_DEV_QCE
        tristate "Qualcomm crypto engine accelerator"

diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 8891ccc5844c3510b5d5c019b5a3df600494f97f..ff4db52256f9002a9fee8de92c7cd1fea4d4e223 100644 (file)
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -4,6 +4,7 @@ obj-$(CONFIG_CRYPTO_DEV_ATMEL_TDES) += atmel-tdes.o
 obj-$(CONFIG_CRYPTO_DEV_BFIN_CRC) += bfin_crc.o
 obj-$(CONFIG_CRYPTO_DEV_CCP) += ccp/
 obj-$(CONFIG_CRYPTO_DEV_CHELSIO) += chelsio/
+obj-$(CONFIG_CRYPTO_DEV_CPT) += cavium/cpt/
 obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM) += caam/
 obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
 obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o