queue-4.19/soc-renesas-identify-r-car-m3-w-es1.3.patch

   1 From 131ceefa7bec6d10d29cf19194da0c655606b7be Mon Sep 17 00:00:00 2001
   2 From: Takeshi Kihara <takeshi.kihara.df@renesas.com>
   3 Date: Thu, 28 Feb 2019 12:00:48 +0100
   4 Subject: soc: renesas: Identify R-Car M3-W ES1.3
   5
   6 [ Upstream commit 15160f6de0bba712fcea078c5ac7571fe33fcd5d ]
   7
   8 The Product Register of R-Car M3-W ES1.3 incorrectly identifies the SoC
   9 revision as ES2.1. Add a workaround to fix this.
  10
  11 Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
  12 Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
  13 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  14 Signed-off-by: Sasha Levin <sashal@kernel.org>
  15 ---
  16  drivers/soc/renesas/renesas-soc.c | 3 +++
  17  1 file changed, 3 insertions(+)
  18
  19 diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c
  20 index d44d0e687ab8..2a43d6e99962 100644
  21 --- a/drivers/soc/renesas/renesas-soc.c
  22 +++ b/drivers/soc/renesas/renesas-soc.c
  23 @@ -285,6 +285,9 @@ static int __init renesas_soc_init(void)
  24                 /* R-Car M3-W ES1.1 incorrectly identifies as ES2.0 */
  25                 if ((product & 0x7fff) == 0x5210)
  26                         product ^= 0x11;
  27 +               /* R-Car M3-W ES1.3 incorrectly identifies as ES2.1 */
  28 +               if ((product & 0x7fff) == 0x5211)
  29 +                       product ^= 0x12;
  30                 if (soc->id && ((product >> 8) & 0xff) != soc->id) {
  31                         pr_warn("SoC mismatch (product = 0x%x)\n", product);
  32                         return -ENODEV;
  33 --
  34 2.20.1
  35