Merge "crypto: msm: enable hw crypto driver for msmfalcon"

This commit is contained in:
Linux Build Service Account 2016-07-27 19:27:03 -07:00 committed by Gerrit - the friendly Code Review server
commit f81c63bdae

View file

@ -372,18 +372,18 @@ config CRYPTO_DEV_QCRYPTO
config CRYPTO_DEV_QCOM_MSM_QCE config CRYPTO_DEV_QCOM_MSM_QCE
tristate "Qualcomm Crypto Engine (QCE) module" tristate "Qualcomm Crypto Engine (QCE) module"
select CRYPTO_DEV_QCE50 if ARCH_APQ8084 || ARCH_MSM8916 || ARCH_MSM8994 || ARCH_MSM8996 || ARCH_MSM8992 || ARCH_MSMTITANIUM || ARCH_MSM8909 || ARCH_MSMCOBALT select CRYPTO_DEV_QCE50 if ARCH_APQ8084 || ARCH_MSM8916 || ARCH_MSM8994 || ARCH_MSM8996 || ARCH_MSM8992 || ARCH_MSMTITANIUM || ARCH_MSM8909 || ARCH_MSMCOBALT || ARCH_MSMFALCON
default n default n
help help
This driver supports Qualcomm Crypto Engine in MSM7x30, MSM8660 This driver supports Qualcomm Crypto Engine in MSM7x30, MSM8660
MSM8x55, MSM8960, MSM9615, MSM8916, MSM8994, MSM8996, FSM9900, MSM8x55, MSM8960, MSM9615, MSM8916, MSM8994, MSM8996, FSM9900,
MSMTITANINUM, APQ8084 and MSMCOBALT. MSMTITANINUM, APQ8084, MSMCOBALT and MSMFALCON.
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
For MSM7x30 MSM8660 and MSM8x55 the module is called qce For MSM7x30 MSM8660 and MSM8x55 the module is called qce
For MSM8960, APQ8064 and MSM9615 the module is called qce40 For MSM8960, APQ8064 and MSM9615 the module is called qce40
For MSM8974, MSM8916, MSM8994, MSM8996, MSM8992, MSMTITANIUM, For MSM8974, MSM8916, MSM8994, MSM8996, MSM8992, MSMTITANIUM,
APQ8084 and MSMCOBALT the module is called qce50. APQ8084, MSMCOBALT and MSMFALCON the module is called qce50.
config CRYPTO_DEV_QCEDEV config CRYPTO_DEV_QCEDEV
tristate "QCEDEV Interface to CE module" tristate "QCEDEV Interface to CE module"
@ -391,7 +391,7 @@ config CRYPTO_DEV_QCEDEV
help help
This driver supports Qualcomm QCEDEV Crypto in MSM7x30, MSM8660, This driver supports Qualcomm QCEDEV Crypto in MSM7x30, MSM8660,
MSM8960, MSM9615, APQ8064, MSM8974, MSM8916, MSM8994, MSM8996, MSM8960, MSM9615, APQ8064, MSM8974, MSM8916, MSM8994, MSM8996,
APQ8084, MSMCOBALT. This exposes the interface to the QCE hardware APQ8084, MSMCOBALT, MSMFALCON. This exposes the interface to the QCE hardware
accelerator via IOCTLs. accelerator via IOCTLs.
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the