Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-imx / cpu-imx27.c

diff --git a/arch/arm/mach-imx/cpu-imx27.c b/arch/arm/mach-imx/cpu-imx27.c
index d8d3b2d84dc577df1cf432cea73c0be29fdaadc4..3b117be37bd2cd8cd6ce997ec294060045c44d11 100644 (file)
--- a/arch/arm/mach-imx/cpu-imx27.c
+++ b/arch/arm/mach-imx/cpu-imx27.c
@@ -42,7 +42,19 @@ static void query_silicon_parameter(void)
        val = __raw_readl(MX27_IO_ADDRESS(MX27_SYSCTRL_BASE_ADDR
                                + SYS_CHIP_ID));
 
-       cpu_silicon_rev = (int)(val >> 28);
+       switch (val >> 28) {
+       case 0:
+               cpu_silicon_rev = IMX_CHIP_REVISION_1_0;
+               break;
+       case 1:
+               cpu_silicon_rev = IMX_CHIP_REVISION_2_0;
+               break;
+       case 2:
+               cpu_silicon_rev = IMX_CHIP_REVISION_2_1;
+               break;
+       default:
+               cpu_silicon_rev = IMX_CHIP_REVISION_UNKNOWN;
+       }
        cpu_partnumber = (int)((val >> 12) & 0xFFFF);
 }