Commit 28229df6 authored Feb 28, 2019 by Takeshi Kihara Committed by Greg Kroah-Hartman Jun 15, 2019

soc: renesas: Identify R-Car M3-W ES1.3



[ Upstream commit 15160f6de0bba712fcea078c5ac7571fe33fcd5d ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent db54e08c

drivers/soc/renesas/renesas-soc.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -285,6 +285,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;