diff options
| author | Tom Rini <trini@ti.com> | 2015-01-25 19:05:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-01-25 19:05:40 -0500 |
| commit | 03cae7261e00e0b36511625ed88f883187c17c77 (patch) | |
| tree | f51093d699a0a1423b9ced808282c16652f1d729 /arch/arm | |
| parent | 41ba57d0c7968506ddcc71604bd39131acf6ee23 (diff) | |
| parent | 361b3d8613f57e137a9048ef69e58e9bcaf51b78 (diff) | |
| download | u-boot-imx-03cae7261e00e0b36511625ed88f883187c17c77.zip u-boot-imx-03cae7261e00e0b36511625ed88f883187c17c77.tar.gz u-boot-imx-03cae7261e00e0b36511625ed88f883187c17c77.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-marvell
Diffstat (limited to 'arch/arm')
| -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; } |