aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto/ux500/hash
diff options
context:
space:
mode:
authorAndreas Westin <andreas.westin@stericsson.com>2012-05-10 04:14:08 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2012-05-15 03:25:33 -0400
commitd1cbb1447bca8eaa28b7a384365932b49c47811f (patch)
tree808a62ab2015d511f0dd1e6d0e0ed01ff70e1234 /drivers/crypto/ux500/hash
parentf7329e71626c977fee672710142eb34ed7d021c7 (diff)
crypto: ux500 - Cleanup hardware identification
Don't use SOC specific functions to identify which crypto hardware we are talking to and use the ID provided in the module instead. Signed-off-by: Andreas Westin <andreas.westin@stericsson.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/ux500/hash')
-rw-r--r--drivers/crypto/ux500/hash/hash_core.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
index 77f7508b6099..6dbb9ec709a3 100644
--- a/drivers/crypto/ux500/hash/hash_core.c
+++ b/drivers/crypto/ux500/hash/hash_core.c
@@ -574,15 +574,6 @@ static int hash_init(struct ahash_request *req)
574 memset(&req_ctx->state, 0, sizeof(struct hash_state)); 574 memset(&req_ctx->state, 0, sizeof(struct hash_state));
575 req_ctx->updated = 0; 575 req_ctx->updated = 0;
576 if (hash_mode == HASH_MODE_DMA) { 576 if (hash_mode == HASH_MODE_DMA) {
577 if ((ctx->config.oper_mode == HASH_OPER_MODE_HMAC) &&
578 cpu_is_u5500()) {
579 pr_debug(DEV_DBG_NAME " [%s] HMAC and DMA not working "
580 "on u5500, directing to CPU mode.",
581 __func__);
582 req_ctx->dma_mode = false; /* Don't use DMA */
583 goto out;
584 }
585
586 if (req->nbytes < HASH_DMA_ALIGN_SIZE) { 577 if (req->nbytes < HASH_DMA_ALIGN_SIZE) {
587 req_ctx->dma_mode = false; /* Don't use DMA */ 578 req_ctx->dma_mode = false; /* Don't use DMA */
588 579
@@ -604,7 +595,6 @@ static int hash_init(struct ahash_request *req)
604 } 595 }
605 } 596 }
606 } 597 }
607out:
608 return 0; 598 return 0;
609} 599}
610 600