summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Schultz <d.schultz@phytec.de>2019-09-17 10:12:53 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-17 20:08:33 +0100
commitd593e48c52699ae6658cdc01990092466954f4cf (patch)
tree6fb37360e177c8600c334e0ce6259349f351b8e6
parent0393233a2c20a7d90781819a1e6cd522d11062b2 (diff)
downloadlinux-stable-d593e48c52699ae6658cdc01990092466954f4cf.tar.gz
linux-stable-d593e48c52699ae6658cdc01990092466954f4cf.tar.bz2
linux-stable-d593e48c52699ae6658cdc01990092466954f4cf.zip
mfd: rk808: Fix RK818 ID template
commit 37ef8c2c15bdc1322b160e38986c187de2b877b2 upstream. 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@vger.kernel.org Cc: Elaine Zhang <zhangqing@rock-chips.com> Cc: Joseph Chen <chenjh@rock-chips.com> Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/linux/mfd/rk808.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h
index 7cfd2b0504df..a59bf323f713 100644
--- a/include/linux/mfd/rk808.h
+++ b/include/linux/mfd/rk808.h
@@ -610,7 +610,7 @@ enum {
RK808_ID = 0x0000,
RK809_ID = 0x8090,
RK817_ID = 0x8170,
- RK818_ID = 0x8181,
+ RK818_ID = 0x8180,
};
struct rk808 {