diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-17 08:49:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-17 08:49:18 +0200 |
| commit | 09efce4ad3c08b89291cedffa054e03ef44f521a (patch) | |
| tree | 07e7d004f1962020401e62750597dfb4028f3af5 /arch/arm/mach-imx/imx35.c | |
| parent | e6f224a55358f3a979434457c78df8fd0303bdff (diff) | |
| parent | f36c7921091090996a9045142624c3b0c4a0160c (diff) | |
| download | barebox-09efce4ad3c08b89291cedffa054e03ef44f521a.tar.gz barebox-09efce4ad3c08b89291cedffa054e03ef44f521a.tar.xz | |
Merge branch 'for-next/imx-work' into for-next/imx
Conflicts:
arch/arm/mach-imx/imx1.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/imx35.c')
| -rw-r--r-- | arch/arm/mach-imx/imx35.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/imx35.c b/arch/arm/mach-imx/imx35.c index aeca70d15f..946c8ddbcc 100644 --- a/arch/arm/mach-imx/imx35.c +++ b/arch/arm/mach-imx/imx35.c @@ -18,6 +18,7 @@ #include <mach/weim.h> #include <mach/imx-regs.h> #include <mach/iim.h> +#include <mach/revision.h> #include <mach/generic.h> void imx35_setup_weimcs(size_t cs, unsigned upper, unsigned lower, @@ -28,14 +29,14 @@ void imx35_setup_weimcs(size_t cs, unsigned upper, unsigned lower, writel(additional, MX35_WEIM_BASE_ADDR + (cs * 0x10) + 0x8); } -int imx_silicon_revision() +static void imx35_silicon_revision(void) { uint32_t reg; reg = readl(MX35_IIM_BASE_ADDR + IIM_SREV); /* 0×00 = TO 1.0, First silicon */ reg += IMX_CHIP_REV_1_0; - return (reg & 0xFF); + imx_set_silicon_revision("i.MX35", reg & 0xFF); } /* @@ -58,9 +59,18 @@ core_initcall(imx35_l2_fix); static int imx35_init(void) { + uint32_t val; + + imx35_silicon_revision(); + + val = readl(MX35_CCM_BASE_ADDR + CCM_RCSR); + imx_25_35_boot_save_loc((val >> CCM_RCSR_MEM_CTRL_SHIFT) & 0x3, + (val >> CCM_RCSR_MEM_TYPE_SHIFT) & 0x3); + add_generic_device("imx_iim", 0, NULL, MX35_IIM_BASE_ADDR, SZ_4K, IORESOURCE_MEM, NULL); + add_generic_device("imx-iomuxv3", 0, NULL, MX35_IOMUXC_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); add_generic_device("imx35-ccm", 0, NULL, MX35_CCM_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); add_generic_device("imx31-gpt", 0, NULL, MX35_GPT1_BASE_ADDR, 0x100, IORESOURCE_MEM, NULL); add_generic_device("imx-gpio", 0, NULL, MX35_GPIO1_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); |