crypto: keembay - Move driver to drivers/crypto/intel/keembay

With the growing number of Intel crypto drivers, it makes sense to
group them all into a single drivers/crypto/intel/ directory.

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Acked-by: Daniele Alessandrelli <daniele.alessandrelli@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/MAINTAINERS b/MAINTAINERS
index 77e8dc3a5cf61f805973f3271231f2f1a29bfc1b..b21027122ce8d4d4750a9bb2068c34300f4d1149 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10415,11 +10415,11 @@ INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVER
 M:     Daniele Alessandrelli <daniele.alessandrelli@intel.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/crypto/intel,keembay-ocs-aes.yaml
-F:     drivers/crypto/keembay/Kconfig
-F:     drivers/crypto/keembay/Makefile
-F:     drivers/crypto/keembay/keembay-ocs-aes-core.c
-F:     drivers/crypto/keembay/ocs-aes.c
-F:     drivers/crypto/keembay/ocs-aes.h
+F:     drivers/crypto/intel/keembay/Kconfig
+F:     drivers/crypto/intel/keembay/Makefile
+F:     drivers/crypto/intel/keembay/keembay-ocs-aes-core.c
+F:     drivers/crypto/intel/keembay/ocs-aes.c
+F:     drivers/crypto/intel/keembay/ocs-aes.h
 
 INTEL KEEM BAY OCS ECC CRYPTO DRIVER
 M:     Daniele Alessandrelli <daniele.alessandrelli@intel.com>
@@ -10427,20 +10427,20 @@ M:    Prabhjot Khurana <prabhjot.khurana@intel.com>
 M:     Mark Gross <mgross@linux.intel.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/crypto/intel,keembay-ocs-ecc.yaml
-F:     drivers/crypto/keembay/Kconfig
-F:     drivers/crypto/keembay/Makefile
-F:     drivers/crypto/keembay/keembay-ocs-ecc.c
+F:     drivers/crypto/intel/keembay/Kconfig
+F:     drivers/crypto/intel/keembay/Makefile
+F:     drivers/crypto/intel/keembay/keembay-ocs-ecc.c
 
 INTEL KEEM BAY OCS HCU CRYPTO DRIVER
 M:     Daniele Alessandrelli <daniele.alessandrelli@intel.com>
 M:     Declan Murphy <declan.murphy@intel.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/crypto/intel,keembay-ocs-hcu.yaml
-F:     drivers/crypto/keembay/Kconfig
-F:     drivers/crypto/keembay/Makefile
-F:     drivers/crypto/keembay/keembay-ocs-hcu-core.c
-F:     drivers/crypto/keembay/ocs-hcu.c
-F:     drivers/crypto/keembay/ocs-hcu.h
+F:     drivers/crypto/intel/keembay/Kconfig
+F:     drivers/crypto/intel/keembay/Makefile
+F:     drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c
+F:     drivers/crypto/intel/keembay/ocs-hcu.c
+F:     drivers/crypto/intel/keembay/ocs-hcu.h
 
 INTEL THUNDER BAY EMMC PHY DRIVER
 M:     Nandhini Srikandan <nandhini.srikandan@intel.com>

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 1571563e4ab9c7d4d40671e67f5b8789201cf41a..fc00d31abd3cfeaabf177295b27ad6b2e40d3d2c 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -506,6 +506,7 @@ source "drivers/crypto/qat/Kconfig"
 source "drivers/crypto/cavium/cpt/Kconfig"
 source "drivers/crypto/cavium/nitrox/Kconfig"
 source "drivers/crypto/marvell/Kconfig"
+source "drivers/crypto/intel/Kconfig"
 
 config CRYPTO_DEV_CAVIUM_ZIP
        tristate "Cavium ZIP driver"
@@ -821,7 +822,6 @@ config CRYPTO_DEV_SA2UL
          used for crypto offload.  Select this if you want to use hardware
          acceleration for cryptographic algorithms on these devices.
 
-source "drivers/crypto/keembay/Kconfig"
 source "drivers/crypto/aspeed/Kconfig"
 
 endif # CRYPTO_HW

diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 476f1a25ca326acb7902594129e5f98772f26035..eb8eb80aab3b0a7b61bce06fae22e2f1876c6db4 100644 (file)
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -51,4 +51,4 @@ obj-$(CONFIG_CRYPTO_DEV_ARTPEC6) += axis/
 obj-y += xilinx/
 obj-y += hisilicon/
 obj-$(CONFIG_CRYPTO_DEV_AMLOGIC_GXL) += amlogic/
-obj-y += keembay/
+obj-y += intel/

diff --git a/drivers/crypto/intel/Kconfig b/drivers/crypto/intel/Kconfig
new file mode 100644 (file)
index 0000000..b5ae1aa
--- /dev/null
+++ b/drivers/crypto/intel/Kconfig
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+
+source "drivers/crypto/intel/keembay/Kconfig"

diff --git a/drivers/crypto/intel/Makefile b/drivers/crypto/intel/Makefile
new file mode 100644 (file)
index 0000000..c392189
--- /dev/null
+++ b/drivers/crypto/intel/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-y += keembay/

diff --git a/drivers/crypto/keembay/Kconfig b/drivers/crypto/intel/keembay/Kconfig
similarity index 100%
rename from drivers/crypto/keembay/Kconfig
rename to drivers/crypto/intel/keembay/Kconfig

diff --git a/drivers/crypto/keembay/Makefile b/drivers/crypto/intel/keembay/Makefile
similarity index 100%
rename from drivers/crypto/keembay/Makefile
rename to drivers/crypto/intel/keembay/Makefile

diff --git a/drivers/crypto/keembay/keembay-ocs-aes-core.c b/drivers/crypto/intel/keembay/keembay-ocs-aes-core.c
similarity index 100%
rename from drivers/crypto/keembay/keembay-ocs-aes-core.c
rename to drivers/crypto/intel/keembay/keembay-ocs-aes-core.c

diff --git a/drivers/crypto/keembay/keembay-ocs-ecc.c b/drivers/crypto/intel/keembay/keembay-ocs-ecc.c
similarity index 100%
rename from drivers/crypto/keembay/keembay-ocs-ecc.c
rename to drivers/crypto/intel/keembay/keembay-ocs-ecc.c

diff --git a/drivers/crypto/keembay/keembay-ocs-hcu-core.c b/drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c
similarity index 100%
rename from drivers/crypto/keembay/keembay-ocs-hcu-core.c
rename to drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c

diff --git a/drivers/crypto/keembay/ocs-aes.c b/drivers/crypto/intel/keembay/ocs-aes.c
similarity index 100%
rename from drivers/crypto/keembay/ocs-aes.c
rename to drivers/crypto/intel/keembay/ocs-aes.c

diff --git a/drivers/crypto/keembay/ocs-aes.h b/drivers/crypto/intel/keembay/ocs-aes.h
similarity index 100%
rename from drivers/crypto/keembay/ocs-aes.h
rename to drivers/crypto/intel/keembay/ocs-aes.h

diff --git a/drivers/crypto/keembay/ocs-hcu.c b/drivers/crypto/intel/keembay/ocs-hcu.c
similarity index 100%
rename from drivers/crypto/keembay/ocs-hcu.c
rename to drivers/crypto/intel/keembay/ocs-hcu.c

diff --git a/drivers/crypto/keembay/ocs-hcu.h b/drivers/crypto/intel/keembay/ocs-hcu.h
similarity index 100%
rename from drivers/crypto/keembay/ocs-hcu.h
rename to drivers/crypto/intel/keembay/ocs-hcu.h