diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig index efa4f32b3fa037439a2cd291ab99372e5603e5a3..f36b37da51b9754cca67a832acee9d2d1b963cc4 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 c26015607868abb1cb6da5d3aeb9d8cf73695414..85ee8ac963b0634d71dfcb3d368f8551aef0d667 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 63d3f1602abf541692626a0744acbc37ce1c1aad..dd289ebdf15abaadd5cc7d52d537f4f866c26c8a 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 cfd1cb3d9f2909d015447cfab92ab8afaeb7f102..6c318d41ed43dccedf257c059016090f16899256 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;