diff options
| author | Cristian Stoica <cristian.stoica@freescale.com> | 2015-04-10 08:30:35 (GMT) |
|---|---|---|
| committer | Honghua Yin <Hong-Hua.Yin@freescale.com> | 2015-04-16 01:43:02 (GMT) |
| commit | 9794f7de21808278961b942590a94fd91ffa0fd5 (patch) | |
| tree | c4fc9486d92d54762b39ac17a3eb8a979be4ad13 /drivers/crypto | |
| parent | b1540b070f540430c553be5fdfa3b9edbf60ec7e (diff) | |
| download | linux-fsl-qoriq-9794f7de21808278961b942590a94fd91ffa0fd5.tar.xz | |
caam: remove dependencies on QI when it is disabled
The dependency on CAAM-QI was incorrectly set on FSL_QMAN and resulted in
an always-enabled CAAM-QI on DPAA platforms. This patch fixes the dependency
and allows CAAM-QI interface to be freely disabled on DPAA platforms.
Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
Change-Id: Iaf752ae8774a7b03383244a6c9fbbadd9959f3d4
Reviewed-on: http://git.am.freescale.net:8181/34732
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Horia Ioan Geanta Neag <horia.geanta@freescale.com>
Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/caam/Makefile | 6 | ||||
| -rw-r--r-- | drivers/crypto/caam/ctrl.c | 6 | ||||
| -rw-r--r-- | drivers/crypto/caam/intern.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/crypto/caam/Makefile b/drivers/crypto/caam/Makefile index 9a4c69b..d63f005 100644 --- a/drivers/crypto/caam/Makefile +++ b/drivers/crypto/caam/Makefile @@ -8,17 +8,17 @@ endif obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM) += caam.o obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_JR) += caam_jr.o obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API) += caamalg.o +obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI) += caamalg_qi.o obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API) += caamhash.o obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API) += caamrng.o obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_JR_UIO) += fsl_jr_uio.o caam-objs := ctrl.o caam_jr-objs := jr.o key_gen.o error.o -ifeq ($(CONFIG_FSL_QMAN), y) +ifneq ($(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI),) + ccflags-y += -DCONFIG_CAAM_QI caam-objs += qi.o endif obj-$(CONFIG_FSL_CAAM_PKC_SUPPORT) += caam_pkc.o caam_pkc-objs := caampkc.o pkc_desc.o - -obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI) += caamalg_qi.o diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index 1f2a437..7a22427 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -12,7 +12,7 @@ #include "desc_constr.h" #include "error.h" -#ifdef CONFIG_FSL_QMAN +#ifdef CONFIG_CAAM_QI #include "qi.h" #endif @@ -303,7 +303,7 @@ static int caam_remove(struct platform_device *pdev) of_device_unregister(ctrlpriv->jrpdev[ring]); } -#ifdef CONFIG_FSL_QMAN +#ifdef CONFIG_CAAM_QI if (ctrlpriv->qidev) caam_qi_shutdown(ctrlpriv->qidev); #endif @@ -638,7 +638,7 @@ static int caam_probe(struct platform_device *pdev) wr_reg32(&ctrlpriv->qi->qi_control_lo, QICTL_DQEN); /* If QMAN driver is present, init CAAM-QI backend */ -#ifdef CONFIG_FSL_QMAN +#ifdef CONFIG_CAAM_QI if (caam_qi_init(pdev, nprop)) dev_err(dev, "caam qi i/f init failed\n"); #endif diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h index 423886a..43596fe 100644 --- a/drivers/crypto/caam/intern.h +++ b/drivers/crypto/caam/intern.h @@ -72,7 +72,7 @@ struct caam_drv_private { struct device *dev; struct platform_device **jrpdev; /* Alloc'ed array per sub-device */ -#ifdef CONFIG_FSL_QMAN +#ifdef CONFIG_CAAM_QI struct device *qidev; #endif struct platform_device *pdev; |