Commit 6b0b1a6b authored Dec 21, 2017 by Arnd Bergmann

Merge tag 'renesas-soc-for-v4.16' of...

Merge tag 'renesas-soc-for-v4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Pull "Renesas ARM Based SoC Updates for v4.16" from Simon Horman:

* Identify R-Car M3-W ES1.1

  Geert Uytterhoeven says "The Product Register of R-Car M3-W ES1.1
  incorrectly identifies the SoC revision as ES2.0.  Add a workaround to
  fix this."

  It is my understanding that this is likely to be forwards-compatibile.

* tag 'renesas-soc-for-v4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  soc: renesas: Identify R-Car M3-W ES1.1

parents c6ff8d79 90f0d2b3

drivers/soc/renesas/renesas-soc.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -250,6 +250,9 @@ static int __init renesas_soc_init(void)
		if (chipid) {
		product = readl(chipid);
		iounmap(chipid);
		/* R-Car M3-W ES1.1 incorrectly identifies as ES2.0 */
		if ((product & 0x7fff) == 0x5210)
		product ^= 0x11;
		if (soc->id && ((product >> 8) & 0xff) != soc->id) {
		pr_warn("SoC mismatch (product = 0x%x)\n", product);
		return -ENODEV;

Admin message