]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
soc: renesas: Identify R-Car M3-W ES1.3
authorTakeshi Kihara <takeshi.kihara.df@renesas.com>
Thu, 28 Feb 2019 11:00:48 +0000 (12:00 +0100)
committerSimon Horman <horms+renesas@verge.net.au>
Mon, 18 Mar 2019 09:33:42 +0000 (10:33 +0100)
The Product Register of R-Car M3-W ES1.3 incorrectly identifies the SoC
revision as ES2.1. Add a workaround to fix this.

Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
drivers/soc/renesas/renesas-soc.c

index 4af96e668a2f1d69f49c0045f56b3b4ea2be6dbf..3299cf5365f3c7d54237cc2a9cf11d859d647a76 100644 (file)
@@ -335,6 +335,9 @@ static int __init renesas_soc_init(void)
                /* R-Car M3-W ES1.1 incorrectly identifies as ES2.0 */
                if ((product & 0x7fff) == 0x5210)
                        product ^= 0x11;
+               /* R-Car M3-W ES1.3 incorrectly identifies as ES2.1 */
+               if ((product & 0x7fff) == 0x5211)
+                       product ^= 0x12;
                if (soc->id && ((product >> 8) & 0xff) != soc->id) {
                        pr_warn("SoC mismatch (product = 0x%x)\n", product);
                        return -ENODEV;