| 123456789101112131415161718192021222324252627282930313233343536373839404142434445 |
- From fa0ece2cc571ba1ccb9d1e0a8d337417c032576e Mon Sep 17 00:00:00 2001
- From: Luka Perkov <luka@openwrt.org>
- Date: Mon, 23 Dec 2013 01:23:07 +0100
- Subject: [PATCH 3/9] ARM: kirkwood: fix cpu info for 6282 device id
- Signed-off-by: Luka Perkov <luka@openwrt.org>
- CC: Prafulla Wadaskar <prafulla@marvell.com>
- ---
- arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
- --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
- +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
- @@ -253,7 +253,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;
-
- @@ -264,7 +264,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";
- @@ -273,7 +279,6 @@ int print_cpuinfo(void)
- rev = "A1";
- break;
- default:
- - rev = "??";
- break;
- }
-
|
