diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-30 18:14:08 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-05 20:03:01 +0200 |
| commit | 5003e4ddc899909c8f9c15978aa53e432b6b3831 (patch) | |
| tree | ae45985765a566e952fc76793ac816924618f897 /arch/arm/mach-imx/imx35.c | |
| parent | 4008d0a34aa495164eadaab66595266286f8f4f4 (diff) | |
| download | barebox-5003e4ddc899909c8f9c15978aa53e432b6b3831.tar.gz barebox-5003e4ddc899909c8f9c15978aa53e432b6b3831.tar.xz | |
ARM i.MX: streamline imx_silicon_revision
All i.MX SoCs now use the same imx_silicon_revision() function to get
the revision. Add a separate header file for it and a common function
used on all SoCs.
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 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/imx35.c b/arch/arm/mach-imx/imx35.c index 722dd4c38c..1575d54d95 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(reg & 0xFF); } /* @@ -58,6 +59,8 @@ core_initcall(imx35_l2_fix); static int imx35_init(void) { + imx35_silicon_revision(); + add_generic_device("imx_iim", 0, NULL, MX35_IIM_BASE_ADDR, SZ_4K, IORESOURCE_MEM, NULL); |