[B][D][SRU][PATCH 1/1] UBUNTU: SAUCE: mfd: rk808: Fix RK818 ID template

Po-Hsu Lin po-hsu.lin at canonical.com
Fri Nov 22 08:48:05 UTC 2019


From: Daniel Schultz <d.schultz at phytec.de>

BugLink: https://bugs.launchpad.net/bugs/1853192

The Rockchip PMIC driver can automatically detect connected component
versions by reading the ID_MSB and ID_LSB registers. The probe function
will always fail with RK818 PMICs because the ID_MSK is 0xFFF0 and the
RK818 template ID is 0x8181.

This patch changes this value to 0x8180.

Fixes: 9d6105e19f61 ("mfd: rk808: Fix up the chip id get failed")
Cc: stable at vger.kernel.org
Cc: Elaine Zhang <zhangqing at rock-chips.com>
Cc: Joseph Chen <chenjh at rock-chips.com>
Signed-off-by: Daniel Schultz <d.schultz at phytec.de>
Signed-off-by: Heiko Stuebner <heiko at sntech.de>
Signed-off-by: Lee Jones <lee.jones at linaro.org>
(backported from commit 37ef8c2c15bdc1322b160e38986c187de2b877b2 linux-next)
[PHLin: content adjustment to skip RK817/RK809, which belongs to 586c1b41]
Signed-off-by: Po-Hsu Lin <po-hsu.lin at canonical.com>
---
 include/linux/mfd/rk808.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h
index d315659..338e0f6 100644
--- a/include/linux/mfd/rk808.h
+++ b/include/linux/mfd/rk808.h
@@ -443,7 +443,7 @@ enum {
 enum {
 	RK805_ID = 0x8050,
 	RK808_ID = 0x0000,
-	RK818_ID = 0x8181,
+	RK818_ID = 0x8180,
 };
 
 struct rk808 {
-- 
2.7.4




More information about the kernel-team mailing list