summaryrefslogtreecommitdiff
path: root/drivers/soc
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-04-29 09:41:16 +0300
committerOlof Johansson <olof@lixom.net>2019-04-29 09:41:16 +0300
commit3e0c0aee4571980328b0e84dd119298b3511805e (patch)
tree8de5ab3b5ecee4c355417a1b0a60a4d8e8460721 /drivers/soc
parentdd3e3f23387b9944469c2cdcb72261a8efc05f4a (diff)
parent15160f6de0bba712fcea078c5ac7571fe33fcd5d (diff)
downloadlinux-3e0c0aee4571980328b0e84dd119298b3511805e.tar.xz
Merge tag 'renesas-drivers-for-v5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into arm/drivers
Renesas ARM Based SoC Drivers Updates for v5.2 * Identify R-Car M3-W ES1.3 * tag 'renesas-drivers-for-v5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: soc: renesas: Identify R-Car M3-W ES1.3 Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/renesas/renesas-soc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c
index 4af96e668a2f..3299cf5365f3 100644
--- a/drivers/soc/renesas/renesas-soc.c
+++ b/drivers/soc/renesas/renesas-soc.c
@@ -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;