diff options
| author | Terry Lv <r65388@freescale.com> | 2012-07-02 12:57:30 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-07-20 13:39:27 +0800 |
| commit | 03a5c2f8b9551bb54d2f8980fb7b1e85e03cbdd9 (patch) | |
| tree | 944dea1ba05e88a97b08393fbbe678a9cabb84c9 | |
| parent | 6149d681634f8508ba41e67be1e5d8b422810d20 (diff) | |
ENGR00215492-4: Enable caam ahash feature in config.
Enable caam ahash feature in config.
Add caam init to other 6q platforms.
Signed-off-by: Terry Lv <r65388@freescale.com>
| -rw-r--r-- | arch/arm/configs/imx6_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabreauto.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabrelite.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabresd.c | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig index efa4f32b3fa0..f36b37da51b9 100644 --- a/arch/arm/configs/imx6_defconfig +++ b/arch/arm/configs/imx6_defconfig @@ -2663,7 +2663,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=255 CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=2048 CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y -# CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API is not set +CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y # CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set # CONFIG_BINARY_PRINTF is not set diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c index c26015607868..85ee8ac963b0 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabreauto.c +++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.c @@ -1475,6 +1475,8 @@ static void __init mx6_board_init(void) imx6q_add_imx_snvs_rtc(); + imx6q_add_imx_caam(); + imx6q_add_imx_i2c(1, &mx6q_sabreauto_i2c1_data); i2c_register_board_info(1, mxc_i2c1_board_info, ARRAY_SIZE(mxc_i2c1_board_info)); diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c index 63d3f1602abf..dd289ebdf15a 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c +++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c @@ -1112,6 +1112,8 @@ static void __init mx6_sabrelite_board_init(void) imx6q_add_mipi_csi2(&mipi_csi2_pdata); imx6q_add_imx_snvs_rtc(); + imx6q_add_imx_caam(); + imx6q_add_imx_i2c(0, &mx6q_sabrelite_i2c_data); imx6q_add_imx_i2c(1, &mx6q_sabrelite_i2c_data); imx6q_add_imx_i2c(2, &mx6q_sabrelite_i2c_data); diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c index cfd1cb3d9f29..6c318d41ed43 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabresd.c +++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c @@ -1664,6 +1664,8 @@ static void __init mx6_sabresd_board_init(void) imx6q_add_mipi_csi2(&mipi_csi2_pdata); imx6q_add_imx_snvs_rtc(); + imx6q_add_imx_caam(); + if (board_is_mx6_reva()) { strcpy(mxc_i2c0_board_info[0].type, "wm8958"); mxc_i2c0_board_info[0].platform_data = &wm8958_config_data; |