From: Geert Uytterhoeven <[email protected]>
According to Documentation/devicetree/bindings/arm/gemini.txt, the
company was originally named "Storlink Semiconductor", and later renamed
to "Storm Semiconductor".
Fixes: 46c5338db7bd45b2 ("crypto: sl3516 - Add sl3516 crypto engine")
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
drivers/crypto/Kconfig | 2 +-
drivers/crypto/gemini/sl3516-ce-cipher.c | 2 +-
drivers/crypto/gemini/sl3516-ce-core.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ebcec460c045734f..8796ddf37cb5bfde 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -267,7 +267,7 @@ config CRYPTO_DEV_NIAGARA2
checksumming, and raw copies.
config CRYPTO_DEV_SL3516
- tristate "Stormlink SL3516 crypto offloader"
+ tristate "Storlink SL3516 crypto offloader"
depends on HAS_IOMEM
select CRYPTO_SKCIPHER
select CRYPTO_ENGINE
diff --git a/drivers/crypto/gemini/sl3516-ce-cipher.c b/drivers/crypto/gemini/sl3516-ce-cipher.c
index b41c2f5fc495a856..c1c2b1d866639149 100644
--- a/drivers/crypto/gemini/sl3516-ce-cipher.c
+++ b/drivers/crypto/gemini/sl3516-ce-cipher.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * sl3516-ce-cipher.c - hardware cryptographic offloader for Stormlink SL3516 SoC
+ * sl3516-ce-cipher.c - hardware cryptographic offloader for Storlink SL3516 SoC
*
* Copyright (C) 2021 Corentin LABBE <[email protected]>
*
diff --git a/drivers/crypto/gemini/sl3516-ce-core.c b/drivers/crypto/gemini/sl3516-ce-core.c
index da6cd529a6c01ff4..b7524b649068e980 100644
--- a/drivers/crypto/gemini/sl3516-ce-core.c
+++ b/drivers/crypto/gemini/sl3516-ce-core.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * sl3516-ce-core.c - hardware cryptographic offloader for Stormlink SL3516 SoC
+ * sl3516-ce-core.c - hardware cryptographic offloader for Storlink SL3516 SoC
*
* Copyright (C) 2021 Corentin Labbe <[email protected]>
*
--
2.25.1
From: Geert Uytterhoeven <[email protected]>
The Storlink SL3516 crypto engine is only present on Storlink
Semiconductor/Storm Semiconductor/Cortina Systems Gemini SoCs.
Hence add a dependency on ARCH_GEMINI, to prevent asking the user about
this driver when configuring a kernel without Gemini support.
While at it, group the dependencies.
Fixes: 46c5338db7bd45b2 ("crypto: sl3516 - Add sl3516 crypto engine")
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
drivers/crypto/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 8796ddf37cb5bfde..51690e73153ad443 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -268,13 +268,13 @@ config CRYPTO_DEV_NIAGARA2
config CRYPTO_DEV_SL3516
tristate "Storlink SL3516 crypto offloader"
- depends on HAS_IOMEM
+ depends on ARCH_GEMINI || COMPILE_TEST
+ depends on HAS_IOMEM && PM
select CRYPTO_SKCIPHER
select CRYPTO_ENGINE
select CRYPTO_ECB
select CRYPTO_AES
select HW_RANDOM
- depends on PM
help
This option allows you to have support for SL3516 crypto offloader.
--
2.25.1
On Fri, Jun 25, 2021 at 03:27:23PM +0200, Geert Uytterhoeven wrote:
> From: Geert Uytterhoeven <[email protected]>
>
> According to Documentation/devicetree/bindings/arm/gemini.txt, the
> company was originally named "Storlink Semiconductor", and later renamed
> to "Storm Semiconductor".
>
> Fixes: 46c5338db7bd45b2 ("crypto: sl3516 - Add sl3516 crypto engine")
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---
> drivers/crypto/Kconfig | 2 +-
> drivers/crypto/gemini/sl3516-ce-cipher.c | 2 +-
> drivers/crypto/gemini/sl3516-ce-core.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
All applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt