diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-12-23 01:23:07 +0100 |
|---|---|---|
| committer | Luka Perkov <luka.perkov@sartura.hr> | 2015-01-25 23:56:15 +0100 |
| commit | 62d1e990d9ac70f718c036ac7167a0058bd2d916 (patch) | |
| tree | d878a74f241575f0dbb4f366107b8a7918a8ac83 | |
| parent | 5aa2297da7f10e4ff231d33f18609396b40aa474 (diff) | |
| download | u-boot-62d1e990d9ac70f718c036ac7167a0058bd2d916.zip u-boot-62d1e990d9ac70f718c036ac7167a0058bd2d916.tar.gz u-boot-62d1e990d9ac70f718c036ac7167a0058bd2d916.tar.bz2 | |
ARM: kirkwood: fix cpu info for 6282 device id
Signed-off-by: Luka Perkov <luka@openwrt.org>
Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
Acked-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c index 9e412bb..4c9d3fd 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c @@ -181,7 +181,7 @@ static void kw_sysrst_check(void) #if defined(CONFIG_DISPLAY_CPUINFO) int print_cpuinfo(void) { - char *rev; + char *rev = "??"; u16 devid = (readl(KW_REG_PCIE_DEVID) >> 16) & 0xffff; u8 revid = readl(KW_REG_PCIE_REVID) & 0xff; @@ -192,7 +192,13 @@ int print_cpuinfo(void) switch (revid) { case 0: - rev = "Z0"; + if (devid == 0x6281) + rev = "Z0"; + else if (devid == 0x6282) + rev = "A0"; + break; + case 1: + rev = "A1"; break; case 2: rev = "A0"; @@ -201,7 +207,6 @@ int print_cpuinfo(void) rev = "A1"; break; default: - rev = "??"; break; } |