diff options
| author | Takeshi Kihara <takeshi.kihara.df@renesas.com> | 2019-02-28 12:00:48 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-15 11:54:11 +0200 |
| commit | 28229df6ad13dd154b62c8c8218cc4a43f974aa3 (patch) | |
| tree | c4ad7e5f153720393f4a7d72aaa8442fa06e0f08 | |
| parent | db54e08c5832a74d8d035a38ebc2c37509272e00 (diff) | |
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>
| -rw-r--r-- | drivers/soc/renesas/renesas-soc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c index d44d0e687ab8..2a43d6e99962 100644 --- a/drivers/soc/renesas/renesas-soc.c +++ b/drivers/soc/renesas/renesas-soc.c @@ -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; |