Fixes for 4.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.4/misc-rtsx-set-correct-pcr_ops-for-rts522a.patch b/queue-4.4/misc-rtsx-set-correct-pcr_ops-for-rts522a.patch
new file mode 100644 (file)
index 0000000..42824f5
--- /dev/null
+++ b/queue-4.4/misc-rtsx-set-correct-pcr_ops-for-rts522a.patch
@@ -0,0 +1,37 @@
+From 99c5272ad6f31244745d8c90dfcd857e86e44f2c Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 26 Mar 2020 11:26:18 +0800
+Subject: misc: rtsx: set correct pcr_ops for rts522A
+
+From: YueHaibing <yuehaibing@huawei.com>
+
+[ Upstream commit 10cea23b6aae15e8324f4101d785687f2c514fe5 ]
+
+rts522a should use rts522a_pcr_ops, which is
+diffrent with rts5227 in phy/hw init setting.
+
+Fixes: ce6a5acc9387 ("mfd: rtsx: Add support for rts522A")
+Signed-off-by: YueHaibing <yuehaibing@huawei.com>
+Cc: stable <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/20200326032618.20472-1-yuehaibing@huawei.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/mfd/rts5227.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/mfd/rts5227.c b/drivers/mfd/rts5227.c
+index ff296a4bf3d23..dc6a9432a4b65 100644
+--- a/drivers/mfd/rts5227.c
++++ b/drivers/mfd/rts5227.c
+@@ -369,6 +369,7 @@ static const struct pcr_ops rts522a_pcr_ops = {
+ void rts522a_init_params(struct rtsx_pcr *pcr)
+ {
+       rts5227_init_params(pcr);
++      pcr->ops = &rts522a_pcr_ops;
+ 
+       pcr->reg_pm_ctrl3 = RTS522A_PM_CTRL3;
+ }
+-- 
+2.20.1
+

diff --git a/queue-4.4/series b/queue-4.4/series
index 903bb963a93c03b5c6c98b6cc73258b9aa988e2d..aade4355342391052236051d489fbae0a45f2af1 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -10,3 +10,4 @@ x86-boot-use-unsigned-comparison-for-addresses.patch
 locking-lockdep-avoid-recursion-in-lockdep_count_-fo.patch
 btrfs-remove-a-bug_on-from-merge_reloc_roots.patch
 btrfs-track-reloc-roots-based-on-their-commit-root-b.patch
+misc-rtsx-set-correct-pcr_ops-for-rts522a.patch