FAILED: patch "[PATCH] mfd: rk808: Fix RK818 ID template" failed to apply to 4.19-stable tree

FAILED: patch "[PATCH] mfd: rk808: Fix RK818 ID template" failed to apply to 4.19-stable tree

[gregkh]

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 37ef8c2c15bdc1322b160e38986c187de2b877b2 Mon Sep 17 00:00:00 2001
From: Daniel Schultz <d.schultz@phytec.de>
Date: Tue, 17 Sep 2019 10:12:53 +0200
Subject: [PATCH] mfd: rk808: Fix RK818 ID template

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>

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 {

Re: FAILED: patch "[PATCH] mfd: rk808: Fix RK818 ID template" failed to apply to 4.19-stable tree

[Sasha Levin]

On Mon, Dec 16, 2019 at 01:00:05PM +0100, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 4.19-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From 37ef8c2c15bdc1322b160e38986c187de2b877b2 Mon Sep 17 00:00:00 2001
>From: Daniel Schultz <d.schultz@phytec.de>
>Date: Tue, 17 Sep 2019 10:12:53 +0200
>Subject: [PATCH] mfd: rk808: Fix RK818 ID template
>
>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>

Adjusted context for missing 586c1b4125b3 ("mfd: rk808: Add RK817 and
RK809 support") and queued for 4.19 and 4.14.

-- 
Thanks,
Sasha