crypto: rockchip: move the code for v1/v2/v3/v4 to the rkcrypto directory

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: Ic15c482b71bd6c11afa5baff66b990eb9a936116

drivers/crypto/rockchip/Kconfig

@@ -16,6 +16,11 @@ config CRYPTO_DEV_ROCKCHIP_V3
 	depends on CPU_RV1106 || CPU_RK3506 || CPU_RK3528 || CPU_RK3562 || CPU_RK3576
 	default y
 
+config CRYPTO_DEV_ROCKCHIP_CRYPTO
+	tristate
+	depends on CRYPTO_DEV_ROCKCHIP_V1 || CRYPTO_DEV_ROCKCHIP_V2 || CRYPTO_DEV_ROCKCHIP_V3
+	default y
+
 endif
 
 config CRYPTO_DEV_ROCKCHIP_DEV

drivers/crypto/rockchip/Makefile

@@ -1,40 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP) += rk_crypto.o
-rk_crypto-objs := rk_crypto_core.o \
-		  rk_crypto_utils.o \
-		  rk_crypto_ahash_utils.o \
-		  rk_crypto_skcipher_utils.o \
-		  procfs.o
 
-rk_crypto-$(CONFIG_CRYPTO_DEV_ROCKCHIP_V1) += \
-		rk_crypto_v1.o \
-		rk_crypto_v1_ahash.o \
-		rk_crypto_v1_skcipher.o
-
-$(obj)/rk_sm2signature.asn1.o: $(obj)/rk_sm2signature.asn1.c $(obj)/rk_sm2signature.asn1.h
-$(obj)/rk_ecdsasignature.asn1.o: $(obj)/rk_ecdsasignature.asn1.c $(obj)/rk_ecdsasignature.asn1.h
-$(obj)/rk_crypto_v2_akcipher.o: $(obj)/rk_sm2signature.asn1.h $(obj)/rk_ecdsasignature.asn1.h
-
-rk_crypto-$(CONFIG_CRYPTO_DEV_ROCKCHIP_V2) += \
-		rk_crypto_v2.o \
-		rk_crypto_v2_ahash.o \
-		rk_crypto_v2_skcipher.o \
-		rk_crypto_v2_akcipher.o \
-		rk_crypto_v2_pka.o \
-		rk_crypto_ecc.o \
-		rk_sm2signature.asn1.o \
-		rk_ecdsasignature.asn1.o \
-		rk_crypto_bignum.o
-
-rk_crypto-$(CONFIG_CRYPTO_DEV_ROCKCHIP_V3) += \
-		rk_crypto_v3.o \
-		rk_crypto_v3_ahash.o \
-		rk_crypto_v3_skcipher.o \
-		rk_crypto_v2_akcipher.o \
-		rk_crypto_v2_pka.o \
-		rk_crypto_ecc.o \
-		rk_sm2signature.asn1.o \
-		rk_ecdsasignature.asn1.o \
-		rk_crypto_bignum.o
+obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP_CRYPTO) += rkcrypto/
 
 obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP_DEV) += cryptodev_linux/

drivers/crypto/rockchip/rkcrypto/Makefile

@@ -0,0 +1,39 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP) += rk_crypto.o
+rk_crypto-objs := rk_crypto_core.o \
+		rk_crypto_utils.o \
+		rk_crypto_ahash_utils.o \
+		rk_crypto_skcipher_utils.o \
+		procfs.o
+
+rk_crypto-$(CONFIG_CRYPTO_DEV_ROCKCHIP_V1) += \
+		rk_crypto_v1.o \
+		rk_crypto_v1_ahash.o \
+		rk_crypto_v1_skcipher.o
+
+$(obj)/rk_sm2signature.asn1.o: $(obj)/rk_sm2signature.asn1.c $(obj)/rk_sm2signature.asn1.h
+$(obj)/rk_ecdsasignature.asn1.o: $(obj)/rk_ecdsasignature.asn1.c $(obj)/rk_ecdsasignature.asn1.h
+$(obj)/rk_crypto_v2_akcipher.o: $(obj)/rk_sm2signature.asn1.h $(obj)/rk_ecdsasignature.asn1.h
+
+rk_crypto-$(CONFIG_CRYPTO_DEV_ROCKCHIP_V2) += \
+		rk_crypto_v2.o \
+		rk_crypto_v2_ahash.o \
+		rk_crypto_v2_skcipher.o \
+		rk_crypto_v2_akcipher.o \
+		rk_crypto_v2_pka.o \
+		rk_crypto_ecc.o \
+		rk_sm2signature.asn1.o \
+		rk_ecdsasignature.asn1.o \
+		rk_crypto_bignum.o
+
+rk_crypto-$(CONFIG_CRYPTO_DEV_ROCKCHIP_V3) += \
+		rk_crypto_v3.o \
+		rk_crypto_v3_ahash.o \
+		rk_crypto_v3_skcipher.o \
+		rk_crypto_v2_akcipher.o \
+		rk_crypto_v2_pka.o \
+		rk_crypto_ecc.o \
+		rk_sm2signature.asn1.o \
+		rk_ecdsasignature.asn1.o \
+		rk_crypto_bignum.o

drivers/crypto/rockchip/rkcrypto/rk_crypto_core.c

@@ -25,7 +25,7 @@
 #include "rk_crypto_v1.h"
 #include "rk_crypto_v2.h"
 #include "rk_crypto_v3.h"
-#include "cryptodev_linux/rk_cryptodev.h"
+#include "../cryptodev_linux/rk_cryptodev.h"
 #include "procfs.h"
 
 #define CRYPTO_NAME	"rkcrypto"