summaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxc/devices
diff options
context:
space:
mode:
authorSteve Cornelius <steve.cornelius@freescale.com>2012-10-19 13:27:24 -0700
committerTerry Lv <r65388@freescale.com>2012-10-29 14:15:40 +0800
commitb05e23043cc3096ee02ed39f5ecae6ae059585b2 (patch)
tree0daeb66e10144d9bcf67982510cd12f45f87b3d1 /arch/arm/plat-mxc/devices
parentab4bd342f5a3bc2782a48a9862c874dbc0f79f79 (diff)
downloadlinux-b05e23043cc3096ee02ed39f5ecae6ae059585b2.tar.gz
ENGR00230538-2: CAAM: Add Secure Memory and SNVS properties
Add Secure Memory and SNVS properties to MX6 configuration. Previous configurations of MX6 platform device definition lacked specific propeties for CAAM Secure Memory and SNVS. Added these properties to define register ranges for both entities. Also corrected the name for the offset of the address range for CAAM Secure Memory to more accurately reflect it's purpose. Signed-off-by: Steve Cornelius <steve.cornelius@freescale.com> Signed-off-by: Terry Lv <r65388@freescale.com>
Diffstat (limited to 'arch/arm/plat-mxc/devices')
-rw-r--r--arch/arm/plat-mxc/devices/platform-imx-caam.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-imx-caam.c b/arch/arm/plat-mxc/devices/platform-imx-caam.c
index 316249032a8d..aaaf501f179c 100644
--- a/arch/arm/plat-mxc/devices/platform-imx-caam.c
+++ b/arch/arm/plat-mxc/devices/platform-imx-caam.c
@@ -31,6 +31,8 @@
const struct imx_caam_data imx6q_imx_caam_data __initconst = {
.iobase_caam = MXC_CAAM_BASE_ADDR,
+ .iobase_caam_sm = CAAM_SECMEM_BASE_ADDR,
+ .iobase_snvs = MX6Q_SNVS_BASE_ADDR,
.irq_sec_vio = MXC_INT_SNVS_SEC,
.irq_snvs = MX6Q_INT_SNVS,
.jr[0].offset_jr = 0x1000,
@@ -51,6 +53,18 @@ struct platform_device *__init imx_add_caam(
.end = data->iobase_caam + SZ_64K - 1,
.flags = IORESOURCE_MEM,
}, {
+ /* Define range for secure memory */
+ .name = "iobase_caam_sm",
+ .start = data->iobase_caam_sm,
+ .end = data->iobase_caam_sm + SZ_16K - 1,
+ .flags = IORESOURCE_MEM,
+ }, {
+ /* Define range for SNVS */
+ .name = "iobase_snvs",
+ .start = data->iobase_snvs,
+ .end = data->iobase_snvs + SZ_4K - 1,
+ .flags = IORESOURCE_MEM,
+ }, {
/* Define interrupt for security violations */
.name = "irq_sec_vio",
.start = data->irq_sec_vio,