Drop i2c-rk3x-adjust-mask-value-offset-for-i2c2-on-rv1126.patch from 6.1

diff --git a/queue-6.1/i2c-rk3x-adjust-mask-value-offset-for-i2c2-on-rv1126.patch b/queue-6.1/i2c-rk3x-adjust-mask-value-offset-for-i2c2-on-rv1126.patch
deleted file mode 100644 (file)
index a80b669..0000000
--- a/queue-6.1/i2c-rk3x-adjust-mask-value-offset-for-i2c2-on-rv1126.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 415eb64a74fe97dc85bcad99deaecfe57dce6b6a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 3 Dec 2023 23:39:59 +1100
-Subject: i2c: rk3x: Adjust mask/value offset for i2c2 on rv1126
-
-From: Tim Lunn <tim@feathertop.org>
-
-[ Upstream commit 92a85b7c6262f19c65a1c115cf15f411ba65a57c ]
-
-Rockchip RV1126 is using old style i2c controller, the i2c2
-bus uses a non-sequential offset in the grf register for the
-mask/value bits for this bus.
-
-This patch fixes i2c2 bus on rv1126 SoCs.
-
-Signed-off-by: Tim Lunn <tim@feathertop.org>
-Acked-by: Heiko Stuebner <heiko@sntech.de>
-Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
-Signed-off-by: Wolfram Sang <wsa@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/i2c/busses/i2c-rk3x.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
-index 6aa4f1f06240..c8cd5cadcf56 100644
---- a/drivers/i2c/busses/i2c-rk3x.c
-+++ b/drivers/i2c/busses/i2c-rk3x.c
-@@ -1295,8 +1295,12 @@ static int rk3x_i2c_probe(struct platform_device *pdev)
-                       return -EINVAL;
-               }
- 
--              /* 27+i: write mask, 11+i: value */
--              value = BIT(27 + bus_nr) | BIT(11 + bus_nr);
-+              /* rv1126 i2c2 uses non-sequential write mask 20, value 4 */
-+              if (i2c->soc_data == &rv1126_soc_data && bus_nr == 2)
-+                      value = BIT(20) | BIT(4);
-+              else
-+                      /* 27+i: write mask, 11+i: value */
-+                      value = BIT(27 + bus_nr) | BIT(11 + bus_nr);
- 
-               ret = regmap_write(grf, i2c->soc_data->grf_offset, value);
-               if (ret != 0) {
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 9ff66f7d0805b062e806d61fc081696caa10dc84..9264afb308076c57c488cdb9ef7cd8ad47aefcbc 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -180,7 +180,6 @@ drm-amd-powerplay-fix-kzalloc-parameter-atom_tonga_p.patch
 drm-amdgpu-fix-with-right-return-code-eio-in-amdgpu_.patch
 drm-amdgpu-release-adev-pm.fw-before-return-in-amdgp.patch
 drm-amdkfd-fix-node-null-check-in-svm_range_get_rang.patch
-i2c-rk3x-adjust-mask-value-offset-for-i2c2-on-rv1126.patch
 perf-fix-the-nr_addr_filters-fix.patch
 wifi-cfg80211-fix-rcu-dereference-in-__cfg80211_bss_.patch
 drm-using-mul_u32_u32-requires-linux-math64.h.patch