diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-06-03 13:06:39 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-06-03 13:06:39 +0200 |
| commit | f2abce53362ea43ef2432b6c9bd444812ff4f7ec (patch) | |
| tree | df7c92a5b760dbb1c7d3f4627149e440d82fb4d2 /arch/arm/mach-imx | |
| parent | 7f37262ee5b28f5c08377188d3a9e6167d480989 (diff) | |
| parent | e9a966e0ef432ca09db25de3c4dd7a7e8da6fdb7 (diff) | |
| download | barebox-f2abce53362ea43ef2432b6c9bd444812ff4f7ec.tar.gz barebox-f2abce53362ea43ef2432b6c9bd444812ff4f7ec.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 10 | ||||
| -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 |
4 files changed, 44 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 02d5db9bcb..419daab8b5 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -2,6 +2,7 @@ if ARCH_IMX config ARCH_TEXT_BASE hex + default 0x83f00000 if MACH_EUKREA_CPUIMX25 default 0xa0000000 if MACH_EUKREA_CPUIMX27 default 0x08f00000 if MACH_MX1ADS default 0xc0000000 if MACH_IMX21ADS @@ -16,6 +17,7 @@ config ARCH_TEXT_BASE default 0x08f80000 if MACH_SCB9328 config BOARDINFO + default "Eukrea CPUIMX25" if MACH_EUKREA_CPUIMX25 default "Eukrea CPUIMX27" if MACH_EUKREA_CPUIMX27 default "Freescale i.MX21 ADS" if MACH_IMX21ADS default "Freescale i.MX27 ADS" if MACH_IMX27ADS @@ -124,6 +126,14 @@ choice prompt "i.MX25 Board Type" +config MACH_EUKREA_CPUIMX25 + bool "Eukrea CPUIMX25" + select MACH_HAS_LOWLEVEL_INIT + select HAVE_MMU + help + Say Y here if you are using the Eukrea Electromatique's CPUIMX25 + equipped with a Freescale i.MX25 Processor + config MACH_FREESCALE_MX25_3STACK bool "Freescale MX25 3stack" select HAS_CFI 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 */ |