ENGR00180943-3: Add CAAM instantiation to i.MX6Q ARM2 board platform

Add CAAM instantiation to i.MX6Q ARM2 board platform configuration.
No other device-on-board configurations added at this time.

Signed-off-by: Steve Cornelius <steve.cornelius@freescale.com>

diff --git a/arch/arm/mach-mx6/board-mx6q_arm2.c b/arch/arm/mach-mx6/board-mx6q_arm2.c
index 1c00882d831492ebe408236c023024bcbe265505..967212abd1b68be94e0e6972ab00a71edd039bb1 100644 (file)
--- a/arch/arm/mach-mx6/board-mx6q_arm2.c
+++ b/arch/arm/mach-mx6/board-mx6q_arm2.c
@@ -2082,6 +2082,8 @@ static void __init mx6_arm2_init(void)
 
        imx6q_add_imx_snvs_rtc();
 
+       imx6q_add_imx_caam();
+
        imx6q_add_imx_i2c(0, &mx6_arm2_i2c0_data);
        imx6q_add_imx_i2c(1, &mx6_arm2_i2c1_data);
        i2c_register_board_info(0, mxc_i2c0_board_info,

diff --git a/arch/arm/mach-mx6/devices-imx6q.h b/arch/arm/mach-mx6/devices-imx6q.h
index 2c3e0c53ac06c546032a74742186379ae20b9b58..995a5bd751ebbb63580af97cf416cf02400056b6 100644 (file)
--- a/arch/arm/mach-mx6/devices-imx6q.h
+++ b/arch/arm/mach-mx6/devices-imx6q.h
@@ -27,6 +27,10 @@ extern const struct imx_snvs_rtc_data imx6q_imx_snvs_rtc_data __initconst;
 #define imx6q_add_imx_snvs_rtc()       \
        imx_add_snvs_rtc(&imx6q_imx_snvs_rtc_data)
 
+extern const struct imx_caam_data imx6q_imx_caam_data __initconst;
+#define imx6q_add_imx_caam()   \
+       imx_add_caam(&imx6q_imx_caam_data)
+
 extern const struct imx_anatop_thermal_imx_data
 imx6q_anatop_thermal_imx_data __initconst;
 #define imx6q_add_anatop_thermal_imx(id, pdata)        \