diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:29:32 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:29:32 -0500 |
| commit | b93a4afcff7be859e30cad2a305731516057d6cf (patch) | |
| tree | fb5fe55864e16527e453efd18790a34db22ee2a1 /arch/arm/mach-mx2/cpu_imx27.c | |
| parent | 62c132a8008991530839401674ce8e1b12b005d3 (diff) | |
| parent | 9b1489e989695c4d502865f8bec616c0f17e99ab (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'arch/arm/mach-mx2/cpu_imx27.c')
| -rw-r--r-- | arch/arm/mach-mx2/cpu_imx27.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/cpu_imx27.c b/arch/arm/mach-mx2/cpu_imx27.c index d9e3bf9644c9..d8d3b2d84dc5 100644 --- a/arch/arm/mach-mx2/cpu_imx27.c +++ b/arch/arm/mach-mx2/cpu_imx27.c | |||
| @@ -39,7 +39,8 @@ static void query_silicon_parameter(void) | |||
| 39 | * the silicon revision very early we read it here to | 39 | * the silicon revision very early we read it here to |
| 40 | * avoid any further hooks | 40 | * avoid any further hooks |
| 41 | */ | 41 | */ |
| 42 | val = __raw_readl(IO_ADDRESS(SYSCTRL_BASE_ADDR) + SYS_CHIP_ID); | 42 | val = __raw_readl(MX27_IO_ADDRESS(MX27_SYSCTRL_BASE_ADDR |
| 43 | + SYS_CHIP_ID)); | ||
| 43 | 44 | ||
| 44 | cpu_silicon_rev = (int)(val >> 28); | 45 | cpu_silicon_rev = (int)(val >> 28); |
| 45 | cpu_partnumber = (int)((val >> 12) & 0xFFFF); | 46 | cpu_partnumber = (int)((val >> 12) & 0xFFFF); |