summaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxc
diff options
context:
space:
mode:
authorSteve Cornelius <steve.cornelius@freescale.com>2012-03-23 10:00:00 -0700
committerJason Liu <r64343@freescale.com>2012-07-20 13:36:47 +0800
commit09d23e451c76ae319bd8e767e9a3ebf368f2c98c (patch)
tree9bb0618edcf1c25c646949e8e6933ab02a5451a2 /arch/arm/plat-mxc
parentf7c82586bf2df800915548de23b48441c276ad13 (diff)
ENGR00180943-5: Add CAAM instantiation data to i.MX6 common platform device set
Add CAAM instantiation data to i.MX6 common platform device set. Signed-off-by: Steve Cornelius <steve.cornelius@freescale.com>
Diffstat (limited to 'arch/arm/plat-mxc')
-rwxr-xr-xarch/arm/plat-mxc/include/mach/devices-common.h12
-rw-r--r--arch/arm/plat-mxc/include/mach/mx6.h2
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h
index 6fce8c4b8255..4ae60dc9e86f 100755
--- a/arch/arm/plat-mxc/include/mach/devices-common.h
+++ b/arch/arm/plat-mxc/include/mach/devices-common.h
@@ -104,6 +104,18 @@ struct imx_snvs_rtc_data {
struct platform_device *__init imx_add_snvs_rtc(
const struct imx_snvs_rtc_data *data);
+struct imx_caam_data {
+ resource_size_t iobase_caam;
+ resource_size_t irq_sec_vio;
+ resource_size_t irq_snvs;
+ resource_size_t irq_jr0;
+ resource_size_t irq_jr1;
+ resource_size_t irq_jr2;
+ resource_size_t irq_jr3;
+};
+
+struct platform_device *__init imx_add_caam(
+ const struct imx_caam_data *data);
#include <mach/imxfb.h>
struct imx_imx_fb_data {
diff --git a/arch/arm/plat-mxc/include/mach/mx6.h b/arch/arm/plat-mxc/include/mach/mx6.h
index 67d00dfbf17c..79093aad6477 100644
--- a/arch/arm/plat-mxc/include/mach/mx6.h
+++ b/arch/arm/plat-mxc/include/mach/mx6.h
@@ -209,6 +209,8 @@
#define ENET_BASE_ADDR (AIPS2_OFF_BASE_ADDR+0x8000)
#define MLB_BASE_ADDR (AIPS2_OFF_BASE_ADDR+0xC000)
+#define MXC_CAAM_BASE_ADDR (AIPS2_ARB_BASE_ADDR + 0x00000)
+
#define MX6Q_USDHC1_BASE_ADDR (AIPS2_OFF_BASE_ADDR + 0x10000)
#define MX6Q_USDHC2_BASE_ADDR (AIPS2_OFF_BASE_ADDR + 0x14000)
#define MX6Q_USDHC3_BASE_ADDR (AIPS2_OFF_BASE_ADDR + 0x18000)