package/boot/uboot-kirkwood/patches/0003-ARM-kirkwood-fix-cpu-info-for-6282-device-id.patch

   1 From fa0ece2cc571ba1ccb9d1e0a8d337417c032576e Mon Sep 17 00:00:00 2001
   2 From: Luka Perkov <luka@openwrt.org>
   3 Date: Mon, 23 Dec 2013 01:23:07 +0100
   4 Subject: [PATCH 3/9] ARM: kirkwood: fix cpu info for 6282 device id
   5
   6 Signed-off-by: Luka Perkov <luka@openwrt.org>
   7 CC: Prafulla Wadaskar <prafulla@marvell.com>
   8 ---
   9  arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 11 ++++++++---
  10  1 file changed, 8 insertions(+), 3 deletions(-)
  11
  12 --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
  13 +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
  14 @@ -253,7 +253,7 @@ static void kw_sysrst_check(void)
  15  #if defined(CONFIG_DISPLAY_CPUINFO)
  16  int print_cpuinfo(void)
  17  {
  18 -       char *rev;
  19 +       char *rev = "??";
  20         u16 devid = (readl(KW_REG_PCIE_DEVID) >> 16) & 0xffff;
  21         u8 revid = readl(KW_REG_PCIE_REVID) & 0xff;
  22
  23 @@ -264,7 +264,13 @@ int print_cpuinfo(void)
  24
  25         switch (revid) {
  26         case 0:
  27 -               rev = "Z0";
  28 +               if (devid == 0x6281)
  29 +                       rev = "Z0";
  30 +               else if (devid == 0x6282)
  31 +                       rev = "A0";
  32 +               break;
  33 +       case 1:
  34 +               rev = "A1";
  35                 break;
  36         case 2:
  37                 rev = "A0";
  38 @@ -273,7 +279,6 @@ int print_cpuinfo(void)
  39                 rev = "A1";
  40                 break;
  41         default:
  42 -               rev = "??";
  43                 break;
  44         }
  45