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/imx27.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/imx27.c')
| -rw-r--r-- | arch/arm/mach-imx/imx27.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/imx27.c b/arch/arm/mach-imx/imx27.c index cd429d04e8..3d7b21da49 100644 --- a/arch/arm/mach-imx/imx27.c +++ b/arch/arm/mach-imx/imx27.c @@ -12,28 +12,38 @@ */ #include <common.h> -#include <mach/imx-regs.h> +#include <mach/imx27-regs.h> #include <mach/weim.h> #include <sizes.h> +#include <mach/revision.h> #include <init.h> #include <io.h> -int imx_silicon_revision(void) +static int imx27_silicon_revision(void) { uint32_t val; + int rev; val = readl(MX27_SYSCTRL_BASE_ADDR); switch (val >> 28) { case 0: - return IMX_CHIP_REV_1_0; + rev = IMX_CHIP_REV_1_0; + break; case 1: - return IMX_CHIP_REV_2_0; + rev = IMX_CHIP_REV_2_0; + break; case 2: - return IMX_CHIP_REV_2_1; + rev = IMX_CHIP_REV_2_1; + break; default: - return IMX_CHIP_REV_UNKNOWN; + rev = IMX_CHIP_REV_UNKNOWN; + break; } + + imx_set_silicon_revision(rev); + + return 0; } void imx27_setup_weimcs(size_t cs, unsigned upper, unsigned lower, @@ -86,6 +96,8 @@ static void imx27_init_max(void) static int imx27_init(void) { + imx27_silicon_revision(); + add_generic_device("imx_iim", 0, NULL, MX27_IIM_BASE_ADDR, SZ_4K, IORESOURCE_MEM, NULL); |