ARM: uniphier: remove part number info from the boot log

As is often the case with SoC development, slightly different
products (i.e. different part number) are developed based on the
same silicon-die.  Such fine grained information is unmaintainable.

Also, "SoC:" is a better fit that "CPU:".

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/mach-uniphier/cpu-info.c b/arch/arm/mach-uniphier/cpu-info.c
index 94dce7c..2ce73c5 100644 (file)
--- a/arch/arm/mach-uniphier/cpu-info.c
+++ b/arch/arm/mach-uniphier/cpu-info.c
@@ -20,37 +20,37 @@ 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)");
+               puts("sLD3");
                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,7 +60,7 @@ 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",