aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/include/mach/mx35.h
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2010-10-08 10:00:10 -0400
committerSascha Hauer <s.hauer@pengutronix.de>2010-10-11 09:28:32 -0400
commit67520f3a896acb1635894fd25626f7fa7c91e61c (patch)
treeadf892987b6ae02cf42fa469a106d102b53d9e2d /arch/arm/plat-mxc/include/mach/mx35.h
parentfdb03870a9714ba2695daa0c2b3e6b6be4318e9d (diff)
ARM: mx35: Add mx35_revision function to query the silicon revision
Based on work done earlier by Sascha Hauer Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Eric Bénard <eric@eukrea.com> [ukl: actually squash the two approaches together] Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/mx35.h')
-rw-r--r--arch/arm/plat-mxc/include/mach/mx35.h18
1 files changed, 4 insertions, 14 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx35.h b/arch/arm/plat-mxc/include/mach/mx35.h
index 5a1c621aeba1..cb071b7b17e5 100644
--- a/arch/arm/plat-mxc/include/mach/mx35.h
+++ b/arch/arm/plat-mxc/include/mach/mx35.h
@@ -1,5 +1,6 @@
1#ifndef __MACH_MX35_H__ 1#ifndef __MACH_MX35_H__
2#define __MACH_MX35_H__ 2#define __MACH_MX35_H__
3
3/* 4/*
4 * IRAM 5 * IRAM
5 */ 6 */
@@ -66,6 +67,8 @@
66#define MX35_CAN1_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xe4000) 67#define MX35_CAN1_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xe4000)
67#define MX35_CAN2_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xe8000) 68#define MX35_CAN2_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xe8000)
68#define MX35_RTIC_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xec000) 69#define MX35_RTIC_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xec000)
70#define MX35_IIM_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xf0000)
71
69#define MX35_OTG_BASE_ADDR 0x53ff4000 72#define MX35_OTG_BASE_ADDR 0x53ff4000
70 73
71#define MX35_ROMP_BASE_ADDR 0x60000000 74#define MX35_ROMP_BASE_ADDR 0x60000000
@@ -187,20 +190,7 @@
187 190
188#define MX35_PROD_SIGNATURE 0x1 /* For MX31 */ 191#define MX35_PROD_SIGNATURE 0x1 /* For MX31 */
189 192
190/* silicon revisions specific to i.MX31 */ 193#define MX35_SYSTEM_REV_MIN MX3x_CHIP_REV_1_0
191#define MX35_CHIP_REV_1_0 0x10
192#define MX35_CHIP_REV_1_1 0x11
193#define MX35_CHIP_REV_1_2 0x12
194#define MX35_CHIP_REV_1_3 0x13
195#define MX35_CHIP_REV_2_0 0x20
196#define MX35_CHIP_REV_2_1 0x21
197#define MX35_CHIP_REV_2_2 0x22
198#define MX35_CHIP_REV_2_3 0x23
199#define MX35_CHIP_REV_3_0 0x30
200#define MX35_CHIP_REV_3_1 0x31
201#define MX35_CHIP_REV_3_2 0x32
202
203#define MX35_SYSTEM_REV_MIN MX35_CHIP_REV_1_0
204#define MX35_SYSTEM_REV_NUM 3 194#define MX35_SYSTEM_REV_NUM 3
205 195
206#ifdef IMX_NEEDS_DEPRECATED_SYMBOLS 196#ifdef IMX_NEEDS_DEPRECATED_SYMBOLS