Drop pinctrl-rockchip-correct-rk3328-iomux-width-flag-for-gpio2-b-pins.patch from...

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

diff --git a/queue-4.19/pinctrl-rockchip-correct-rk3328-iomux-width-flag-for-gpio2-b-pins.patch b/queue-4.19/pinctrl-rockchip-correct-rk3328-iomux-width-flag-for-gpio2-b-pins.patch
deleted file mode 100644 (file)
index cdfd24b..0000000
--- a/queue-4.19/pinctrl-rockchip-correct-rk3328-iomux-width-flag-for-gpio2-b-pins.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 128f71fe014fc91efa1407ce549f94a9a9f1072c Mon Sep 17 00:00:00 2001
-From: Huang-Huang Bao <i@eh5.me>
-Date: Tue, 9 Jul 2024 18:54:28 +0800
-Subject: pinctrl: rockchip: correct RK3328 iomux width flag for GPIO2-B pins
-
-From: Huang-Huang Bao <i@eh5.me>
-
-commit 128f71fe014fc91efa1407ce549f94a9a9f1072c upstream.
-
-The base iomux offsets for each GPIO pin line are accumulatively
-calculated based off iomux width flag in rockchip_pinctrl_get_soc_data.
-If the iomux width flag is one of IOMUX_WIDTH_4BIT, IOMUX_WIDTH_3BIT or
-IOMUX_WIDTH_2BIT, the base offset for next pin line would increase by 8
-bytes, otherwise it would increase by 4 bytes.
-
-Despite most of GPIO2-B iomux have 2-bit data width, which can be fit
-into 4 bytes space with write mask, it actually take 8 bytes width for
-whole GPIO2-B line.
-
-Commit e8448a6c817c ("pinctrl: rockchip: fix pinmux bits for RK3328
-GPIO2-B pins") wrongly set iomux width flag to 0, causing all base
-iomux offset for line after GPIO2-B to be calculated wrong. Fix the
-iomux width flag to IOMUX_WIDTH_2BIT so the offset after GPIO2-B is
-correctly increased by 8, matching the actual width of GPIO2-B iomux.
-
-Fixes: e8448a6c817c ("pinctrl: rockchip: fix pinmux bits for RK3328 GPIO2-B pins")
-Cc: stable@vger.kernel.org
-Reported-by: Richard Kojedzinszky <richard@kojedz.in>
-Closes: https://lore.kernel.org/linux-rockchip/4f29b743202397d60edfb3c725537415@kojedz.in/
-Tested-by: Richard Kojedzinszky <richard@kojedz.in>
-Signed-off-by: Huang-Huang Bao <i@eh5.me>
-Reviewed-by: Heiko Stuebner <heiko@sntech.de>
-Tested-by: Daniel Golle <daniel@makrotopia.org>
-Tested-by: Trevor Woerner <twoerner@gmail.com>
-Link: https://lore.kernel.org/20240709105428.1176375-1-i@eh5.me
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/pinctrl/pinctrl-rockchip.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/pinctrl/pinctrl-rockchip.c
-+++ b/drivers/pinctrl/pinctrl-rockchip.c
-@@ -3736,7 +3736,7 @@ static struct rockchip_pin_bank rk3328_p
-       PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", 0, 0, 0, 0),
-       PIN_BANK_IOMUX_FLAGS(1, 32, "gpio1", 0, 0, 0, 0),
-       PIN_BANK_IOMUX_FLAGS(2, 32, "gpio2", 0,
--                           0,
-+                           IOMUX_WIDTH_2BIT,
-                            IOMUX_WIDTH_3BIT,
-                            0),
-       PIN_BANK_IOMUX_FLAGS(3, 32, "gpio3",

diff --git a/queue-4.19/series b/queue-4.19/series
index 3060e9a4f9b8fb125492d40fd69529063afcfddf..bd66c63571c59ab7186cec4e576fb077ede609d3 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -70,7 +70,6 @@ bluetooth-hci_ldisc-check-hci_uart_proto_ready-flag-in-hciuartgetproto.patch
 input-mt-limit-max-slots.patch
 tools-move-alignment-related-macros-to-new-linux-align.h.patch
 drm-amdgpu-using-uninitialized-value-size-when-calling-amdgpu_vce_cs_reloc.patch
-pinctrl-rockchip-correct-rk3328-iomux-width-flag-for-gpio2-b-pins.patch
 pinctrl-single-fix-potential-null-dereference-in-pcs_get_function.patch
 wifi-mwifiex-duplicate-static-structs-used-in-driver-instances.patch
 dm-suspend-return-erestartsys-instead-of-eintr.patch

diff --git a/queue-5.4/pinctrl-rockchip-correct-rk3328-iomux-width-flag-for-gpio2-b-pins.patch b/queue-5.4/pinctrl-rockchip-correct-rk3328-iomux-width-flag-for-gpio2-b-pins.patch
deleted file mode 100644 (file)
index 4b4ce37..0000000
--- a/queue-5.4/pinctrl-rockchip-correct-rk3328-iomux-width-flag-for-gpio2-b-pins.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 128f71fe014fc91efa1407ce549f94a9a9f1072c Mon Sep 17 00:00:00 2001
-From: Huang-Huang Bao <i@eh5.me>
-Date: Tue, 9 Jul 2024 18:54:28 +0800
-Subject: pinctrl: rockchip: correct RK3328 iomux width flag for GPIO2-B pins
-
-From: Huang-Huang Bao <i@eh5.me>
-
-commit 128f71fe014fc91efa1407ce549f94a9a9f1072c upstream.
-
-The base iomux offsets for each GPIO pin line are accumulatively
-calculated based off iomux width flag in rockchip_pinctrl_get_soc_data.
-If the iomux width flag is one of IOMUX_WIDTH_4BIT, IOMUX_WIDTH_3BIT or
-IOMUX_WIDTH_2BIT, the base offset for next pin line would increase by 8
-bytes, otherwise it would increase by 4 bytes.
-
-Despite most of GPIO2-B iomux have 2-bit data width, which can be fit
-into 4 bytes space with write mask, it actually take 8 bytes width for
-whole GPIO2-B line.
-
-Commit e8448a6c817c ("pinctrl: rockchip: fix pinmux bits for RK3328
-GPIO2-B pins") wrongly set iomux width flag to 0, causing all base
-iomux offset for line after GPIO2-B to be calculated wrong. Fix the
-iomux width flag to IOMUX_WIDTH_2BIT so the offset after GPIO2-B is
-correctly increased by 8, matching the actual width of GPIO2-B iomux.
-
-Fixes: e8448a6c817c ("pinctrl: rockchip: fix pinmux bits for RK3328 GPIO2-B pins")
-Cc: stable@vger.kernel.org
-Reported-by: Richard Kojedzinszky <richard@kojedz.in>
-Closes: https://lore.kernel.org/linux-rockchip/4f29b743202397d60edfb3c725537415@kojedz.in/
-Tested-by: Richard Kojedzinszky <richard@kojedz.in>
-Signed-off-by: Huang-Huang Bao <i@eh5.me>
-Reviewed-by: Heiko Stuebner <heiko@sntech.de>
-Tested-by: Daniel Golle <daniel@makrotopia.org>
-Tested-by: Trevor Woerner <twoerner@gmail.com>
-Link: https://lore.kernel.org/20240709105428.1176375-1-i@eh5.me
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/pinctrl/pinctrl-rockchip.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/pinctrl/pinctrl-rockchip.c
-+++ b/drivers/pinctrl/pinctrl-rockchip.c
-@@ -3771,7 +3771,7 @@ static struct rockchip_pin_bank rk3328_p
-       PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", 0, 0, 0, 0),
-       PIN_BANK_IOMUX_FLAGS(1, 32, "gpio1", 0, 0, 0, 0),
-       PIN_BANK_IOMUX_FLAGS(2, 32, "gpio2", 0,
--                           0,
-+                           IOMUX_WIDTH_2BIT,
-                            IOMUX_WIDTH_3BIT,
-                            0),
-       PIN_BANK_IOMUX_FLAGS(3, 32, "gpio3",

diff --git a/queue-5.4/series b/queue-5.4/series
index 1cbebe2066460abb69d3bd7a5687da12b26ef51f..0056f34d7370c5cf279a232bf2ac07d4b4669e79 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -107,7 +107,6 @@ bluetooth-hci_ldisc-check-hci_uart_proto_ready-flag-in-hciuartgetproto.patch
 input-mt-limit-max-slots.patch
 tools-move-alignment-related-macros-to-new-linux-align.h.patch
 drm-amdgpu-using-uninitialized-value-size-when-calling-amdgpu_vce_cs_reloc.patch
-pinctrl-rockchip-correct-rk3328-iomux-width-flag-for-gpio2-b-pins.patch
 pinctrl-single-fix-potential-null-dereference-in-pcs_get_function.patch
 wifi-mwifiex-duplicate-static-structs-used-in-driver-instances.patch
 ipc-replace-costly-bailout-check-in-sysvipc_find_ipc.patch