soc: soc_ti_k3: identify j7200 SR2.0 SoCs
authorBryan Brattlof <bb@ti.com>
Tue, 21 Jun 2022 21:36:03 +0000 (16:36 -0500)
committerTom Rini <trini@konsulko.com>
Wed, 6 Jul 2022 18:30:51 +0000 (14:30 -0400)
Anytime a new revision of a chip is produced, Texas Instruments
will increment the 4 bit VARIANT section of the CTRLMMR_WKUP_JTAGID
register by one. Typically this will be decoded as SR1.0 -> SR2.0 ...
however a few TI SoCs do not follow this convention.

Rather than defining a revision string array for each SoC, use a
default revision string array for all TI SoCs that continue to follow
the typical 1.0 -> 2.0 revision scheme.

Signed-off-by: Bryan Brattlof <bb@ti.com>
drivers/soc/soc_ti_k3.c

index 4234414..b1e7c4a 100644 (file)
@@ -64,8 +64,8 @@ static char *j721e_rev_string_map[] = {
        "1.0", "1.1",
 };
 
-static char *am65x_rev_string_map[] = {
-       "1.0", "2.0",
+static char *typical_rev_string_map[] = {
+       "1.0", "2.0", "3.0",
 };
 
 static const char *get_rev_string(u32 idreg)
@@ -82,16 +82,10 @@ static const char *get_rev_string(u32 idreg)
                        goto bail;
                return j721e_rev_string_map[rev];
 
-       case AM65X:
-               if (rev > ARRAY_SIZE(am65x_rev_string_map))
-                       goto bail;
-               return am65x_rev_string_map[rev];
-
-       case AM64X:
-       case J7200:
        default:
-               if (!rev)
-                       return "1.0";
+               if (rev > ARRAY_SIZE(typical_rev_string_map))
+                       goto bail;
+               return typical_rev_string_map[rev];
        };
 
 bail: