openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Renesas ARM Based SoC Drivers Updates for v5.2 

* Identify R-Car M3-W ES1.3
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4nzZofWswv9L/nKF189kaWo3T74FAly52tsACgkQ189kaWo3
 T75R7A//fhCNtwgh1c4fZRE7Sjh0NpBj5LoD4QlcL86oCIKfL5qUFekDiCQCb7e+
 AhxBIuNNuSEJCFj8weL1rXH+LA0CYihd4pUd109ZLXXB0uFSWLzMML4YAnSq0PLG
 a0EWlqSZE7UnFrAGzEew3BOj3WG+alSCO1HKahgIC18FzYmB6CTb3C8N2MNH19/X
 Uu415t0SqRU4kz9EUIyexxiBqJedbF8FqHpbdtyGftqLojZK1t7U6rFcxr6IUaO8
 Y8e+4au2lZib6vr6L80d8TMNfkRTrsn1Uef9EF93/5wTblviY1SZgDF/F+8aSySa
 uDsymZ2MiIsWEY9u/Hq9UveKsOKBdYersf4s+T7plJG2W2gConpHvebBbocPGwi2
 cPkqM2fm3lsKChY/OMH45oUoK4B+BnWouXo7tRstgeWZ4XLT56dbij5RHSDSlQj/
 YfICXoHUnZdnnO32nKEFqa5/f5agYVl/5Z6XVqt6A0iknBtn9gZryHEuQn5un1UH
 q7b1zalp9y3l0+M57ZFcIyo6fL+H6XzRQ82LIEMdXktFCe3oCn50uU/a1VCO8XqJ
 hC9qICLwSMBWcyaW0170+K+6lhHrCEnpgIe7uxM4+4h4DuxfFSFPOJ3q4uggBgWY
 1IMEi9bo8IZa1j/vKabri7IDBf5CtUSJfE0dYmpTgSy1WgK/JYI=
 =EoPM
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2019-04-28 23:41:16 -07:00
parent dd3e3f2338 15160f6de0
commit 3e0c0aee45
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/soc/renesas/renesas-soc.c
View File

@ -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;