From a354d958d42ae65eca6f5524506e8a9783db198a Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Sun, 20 Mar 2016 20:19:16 +0100 Subject: [PATCH 1/4] ARM: mvebu_v7_defconfig: Enabling the new Marvell's cryptographic engine driver This enables the new driver for Marvell CESA crypto engines on all mvebu v7. Signed-off-by: Romain Perier Signed-off-by: Gregory CLEMENT --- arch/arm/configs/mvebu_v7_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig index dc5797a2efab5..bedfa95d8d64f 100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@ -155,3 +155,4 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_TIMER_STATS=y # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_DEBUG_USER=y +CONFIG_CRYPTO_DEV_MARVELL_CESA=y From e269777f72b32db6200f6d925cc40d8613c5c308 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 29 Mar 2016 18:17:40 +0200 Subject: [PATCH 2/4] MAINTAINERS: attach arch/arm/configs/mvebu_*_defconfig to relevant maintainers The arch/arm/configs/mvebu_*_defconfig currently don't belong to any maintainer, so get_maintainer returns only information based on commits, which is not completely accurate. Therefore, this commit replaces a useless empty newline in MAINTAINERS by a line attaching those defconfigs to the appropriate Marvell EBU maintainers. Signed-off-by: Thomas Petazzoni Acked-by: Jason Cooper Signed-off-by: Gregory CLEMENT --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 03e00c7c88ebc..5bb9f3e475483 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1322,7 +1322,7 @@ F: drivers/rtc/rtc-armada38x.c F: arch/arm/boot/dts/armada* F: arch/arm/boot/dts/kirkwood* F: arch/arm64/boot/dts/marvell/armada* - +F: arch/arm/configs/mvebu_*_defconfig ARM/Marvell Berlin SoC support M: Sebastian Hesselbarth From f092d438018d60fc2a5b507963ae107041c699ea Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Fri, 18 Mar 2016 09:44:54 +0100 Subject: [PATCH 3/4] ARM: multi_v7_defconfig: Enabling the new Marvell's cryptographic engine driver This enables the new driver for Marvell CESA crypto engines on all ARMv7. Signed-off-by: Romain Perier Signed-off-by: Gregory CLEMENT --- arch/arm/configs/multi_v7_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 28234906a0646..392e970b60c73 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -829,6 +829,7 @@ CONFIG_LOCKUP_DETECTOR=y CONFIG_CRYPTO_DEV_TEGRA_AES=y CONFIG_CPUFREQ_DT=y CONFIG_KEYSTONE_IRQ=y +CONFIG_CRYPTO_DEV_MARVELL_CESA=m CONFIG_CRYPTO_DEV_SUN4I_SS=m CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_ARM_CRYPTO=y From 23d2af622de748bf57d31a4125d06d183c29e908 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Tue, 29 Mar 2016 10:02:28 +0200 Subject: [PATCH 4/4] ARM: mvebu_v5_defconfig: Switching to the new Marvell's cryptographic engine driver This enables the new driver for Marvell CESA crypto engines on all mvebu v5. The old driver is no longer used, but it is still in the tree for fallback. Signed-off-by: Romain Perier Signed-off-by: Gregory CLEMENT --- arch/arm/configs/mvebu_v5_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig index 4562006aae68a..6051c51ca1883 100644 --- a/arch/arm/configs/mvebu_v5_defconfig +++ b/arch/arm/configs/mvebu_v5_defconfig @@ -208,8 +208,8 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_PREEMPT is not set # CONFIG_FTRACE is not set CONFIG_DEBUG_USER=y +CONFIG_CRYPTO_DEV_MARVELL_CESA=y CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_DEV_MV_CESA=y CONFIG_CRC_CCITT=y CONFIG_LIBCRC32C=y