Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[oweals/u-boot.git] / arch / arm / mach-uniphier / cpu_info.c

diff --git a/arch/arm/mach-uniphier/cpu_info.c b/arch/arm/mach-uniphier/cpu_info.c
index 13a0b1e48fbcf5503f7b7742f135ca61aa4f7a6a..5d9ed84be4ece3e24c7601467f7485eb2f4dc43a 100644 (file)
--- a/arch/arm/mach-uniphier/cpu_info.c
+++ b/arch/arm/mach-uniphier/cpu_info.c
@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2013-2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2013-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sg-regs.h>
 
 int print_cpuinfo(void)
@@ -35,6 +34,15 @@ int print_cpuinfo(void)
        case 0x29:
                puts("PH1-sLD8 (MN2WS0270)");
                break;
+       case 0x2A:
+               puts("PH1-Pro5 (MN2WS0300)");
+               break;
+       case 0x2E:
+               puts("ProXstream2 (MN2WS0310)");
+               break;
+       case 0x2F:
+               puts("PH1-LD6b (MN2WS0320)");
+               break;
        default:
                printf("Unknown Processor ID (0x%x)\n", revision);
                return -1;