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

[u-boot] / arch / arm / cpu / pxa / cpuinfo.c

diff --git a/arch/arm/cpu/pxa/cpuinfo.c b/arch/arm/cpu/pxa/cpuinfo.c
index 17d8be5b5b1c1025902012d87015764ed080764d..5379e13e2b26b385deb2ad85f57e575d9402019b 100644 (file)
--- a/arch/arm/cpu/pxa/cpuinfo.c
+++ b/arch/arm/cpu/pxa/cpuinfo.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * PXA CPU information display
  *
  * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -46,6 +45,13 @@ int cpu_is_pxa27x(void)
        return id == CPU_VALUE_PXA27X;
 }
 
+int cpu_is_pxa27xm(void)
+{
+       uint32_t id = pxa_get_cpuid();
+       return ((id & CPU_MASK_PXA_PRODID) == CPU_VALUE_PXA27X) &&
+                       ((id & CPU_MASK_PXA_REVID) == 8);
+}
+
 uint32_t pxa_get_cpu_revision(void)
 {
        return pxa_get_cpuid() & CPU_MASK_PRODREV;
@@ -91,13 +97,17 @@ static const char *pxa27x_get_revision(void)
 
        id = pxa_get_cpuid() & CPU_MASK_PXA_REVID;
 
-       if ((id == 5) || (id == 6) || (id > 7))
+       if ((id == 5) || (id == 6) || (id > 8))
                return unknown;
 
        /* Cap the special PXA270 C5 case. */
        if (id == 7)
                id = 5;
 
+       /* Cap the special PXA270M A1 case. */
+       if (id == 8)
+               id = 1;
+
        return rev[id];
 }
 
@@ -107,7 +117,9 @@ static int print_cpuinfo_pxa2xx(void)
                puts("Marvell PXA25x rev. ");
                puts(pxa25x_get_revision());
        } else if (cpu_is_pxa27x()) {
-               puts("Marvell PXA27x rev. ");
+               puts("Marvell PXA27x");
+               if (cpu_is_pxa27xm()) puts("M");
+               puts(" rev. ");
                puts(pxa27x_get_revision());
        } else
                return -EINVAL;