diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-07-19 12:40:22 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-07-19 12:40:22 -0400 |
| commit | ca79234af3a9e6d942763a58956b337e69bf1340 (patch) | |
| tree | e3b923f28f8e1282a16a0b55d7dce7e2b0a9fa44 /drivers/soc/renesas/renesas-soc.c | |
| parent | 858848641fbecd42437e36adc9291b0ce5db379e (diff) | |
| parent | 3bd837bfe431839a378e9d421af05b2e22a6d329 (diff) | |
Merge tag 'v4.19.59' into v4.19-rt
This is the 4.19.59 stable release
Diffstat (limited to 'drivers/soc/renesas/renesas-soc.c')
| -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; |