SPDX: Convert all of our single license tags to Linux Kernel style

[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 94dce7c90d8a9b36037ea1d6f8042f297ab8494d..9f5f5051b318d128d11644861beba8c89cb240d4 100644 (file)
--- a/arch/arm/mach-uniphier/cpu-info.c
+++ b/arch/arm/mach-uniphier/cpu-info.c
@@ -1,14 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2013-2014 Panasonic Corporation
  * Copyright (C) 2015-2017 Socionext Inc.
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <common.h>
+#include <stdio.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 
 #include "soc-info.h"
 
@@ -20,37 +20,33 @@ int print_cpuinfo(void)
        model = uniphier_get_soc_model();
        rev = uniphier_get_soc_revision();
 
-       puts("CPU:   ");
+       puts("SoC:   ");
 
        switch (id) {
-       case UNIPHIER_SLD3_ID:
-               puts("sLD3 (MN2WS0220)");
-               required_model = 2;
-               break;
        case UNIPHIER_LD4_ID:
-               puts("LD4 (MN2WS0250)");
+               puts("LD4");
                required_rev = 2;
                break;
        case UNIPHIER_PRO4_ID:
-               puts("Pro4 (MN2WS0230)");
+               puts("Pro4");
                break;
        case UNIPHIER_SLD8_ID:
-               puts("sLD8 (MN2WS0270)");
+               puts("sLD8");
                break;
        case UNIPHIER_PRO5_ID:
-               puts("Pro5 (MN2WS0300)");
+               puts("Pro5");
                break;
        case UNIPHIER_PXS2_ID:
-               puts("PXs2 (MN2WS0310)");
+               puts("PXs2");
                break;
        case UNIPHIER_LD6B_ID:
-               puts("LD6b (MN2WS0320)");
+               puts("LD6b");
                break;
        case UNIPHIER_LD11_ID:
-               puts("LD11 (SC1405AP1)");
+               puts("LD11");
                break;
        case UNIPHIER_LD20_ID:
-               puts("LD20 (SC1401AJ1)");
+               puts("LD20");
                break;
        case UNIPHIER_PXS3_ID:
                puts("PXs3");
@@ -60,14 +56,14 @@ int print_cpuinfo(void)
                return -ENOTSUPP;
        }
 
-       printf(" model %d (revision %d)\n", model, rev);
+       printf(" (model %d, revision %d)\n", model, rev);
 
        if (model < required_model) {
-               printf("Only model %d or newer is supported.\n",
+               pr_err("Only model %d or newer is supported.\n",
                       required_model);
                return -ENOTSUPP;
        } else if (rev < required_rev) {
-               printf("Only revision %d or newer is supported.\n",
+               pr_err("Only revision %d or newer is supported.\n",
                       required_rev);
                return -ENOTSUPP;
        }