diff options
| author | Marc Reilly <marc@cpdesign.com.au> | 2010-05-14 12:15:17 +1000 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-05-17 10:53:28 +0200 |
| commit | c2f9285511251e385002bb88baf33e7001405fcb (patch) | |
| tree | a8b11ec6b6cd6e98b2334cc43707f91d189ca2d8 /arch | |
| parent | 55626da787fc259346e9c26c4b366ca246c78734 (diff) | |
| download | barebox-c2f9285511251e385002bb88baf33e7001405fcb.tar.gz barebox-c2f9285511251e385002bb88baf33e7001405fcb.tar.xz | |
imx35: add detection of silicon revision
Implemented imx_silicon_revision() for imx35.
Signed-off-by: Marc Reilly <marc@cpdesign.com.au>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/imx35.c | 11 | ||||
| -rw-r--r-- | arch/arm/mach-imx/include/mach/generic.h | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/include/mach/imx35-regs.h | 18 |
3 files changed, 34 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/imx35.c b/arch/arm/mach-imx/imx35.c index f2fea4cdc4..d78a4c5458 100644 --- a/arch/arm/mach-imx/imx35.c +++ b/arch/arm/mach-imx/imx35.c @@ -16,6 +16,9 @@ */ #include <common.h> +#include <asm/io.h> +#include <mach/imx-regs.h> +#include <mach/generic.h> #include "gpio.h" @@ -27,3 +30,11 @@ void *imx_gpio_base[] = { int imx_gpio_count = ARRAY_SIZE(imx_gpio_base) * 32; +int imx_silicon_revision() +{ + uint32_t reg; + reg = readl(IMX_IIM_BASE + IIM_SREV); + reg += IMX35_CHIP_REVISION_1_0; + + return (reg & 0xFF); +} diff --git a/arch/arm/mach-imx/include/mach/generic.h b/arch/arm/mach-imx/include/mach/generic.h index 99a53a49a4..48ed336cee 100644 --- a/arch/arm/mach-imx/include/mach/generic.h +++ b/arch/arm/mach-imx/include/mach/generic.h @@ -3,6 +3,11 @@ int imx_silicon_revision(void); #define IMX27_CHIP_REVISION_1_0 0 #define IMX27_CHIP_REVISION_2_0 1 +#define IMX35_CHIP_REVISION_1_0 0x10 +#define IMX35_CHIP_REVISION_2_0 0x20 + + + #ifdef CONFIG_ARCH_IMX1 #define cpu_is_mx1() (1) #else diff --git a/arch/arm/mach-imx/include/mach/imx35-regs.h b/arch/arm/mach-imx/include/mach/imx35-regs.h index c394a2af88..899e57bc8f 100644 --- a/arch/arm/mach-imx/include/mach/imx35-regs.h +++ b/arch/arm/mach-imx/include/mach/imx35-regs.h @@ -76,6 +76,24 @@ #define PDR0_AUTO_CON (1 << 0) #define PDR0_PER_SEL (1 << 26) + +#define IIM_STAT 0x0000 +#define IIM_STATM 0x0004 +#define IIM_ERR 0x0008 +#define IIM_EMASK 0x000C +#define IIM_FCTL 0x0010 +#define IIM_UA 0x0014 +#define IIM_LA 0x0018 +#define IIM_SDAT 0x001C +#define IIM_PREV 0x0020 +#define IIM_SREV 0x0024 +#define IIM_PREG_P 0x0028 +#define IIM_SCS0 0x002C +#define IIM_SCS1 0x0030 +#define IIM_SCS2 0x0034 +#define IIM_SCS3 0x0038 + + /* * Adresses and ranges of the external chip select lines */ |