Drop pwm-ab8500-explicitly-allocate-pwm-chip-base-dynamic.patch

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

diff --git a/queue-5.10/pwm-ab8500-explicitly-allocate-pwm-chip-base-dynamic.patch b/queue-5.10/pwm-ab8500-explicitly-allocate-pwm-chip-base-dynamic.patch
deleted file mode 100644 (file)
index 2f6e576..0000000
--- a/queue-5.10/pwm-ab8500-explicitly-allocate-pwm-chip-base-dynamic.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f3aa3733ee2ad272242440d575e3f747606d3779 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 6 Nov 2020 18:15:47 +0100
-Subject: pwm: ab8500: Explicitly allocate pwm chip base dynamically
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <uwe@kleine-koenig.org>
-
-[ Upstream commit 5e5da1e9fbeecdf9d7a7495d7ae2a37453e38499 ]
-
-The ab8500 driver is the last one which doesn't (explicitly) use dynamic
-allocation of the pwm id. Looking through the kernel sources I didn't
-find a place that relies on this id. And with the device probed from
-device tree pdev->id is -1 anyhow; making this explicit looks
-beneficial, too.
-
-Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
-Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pwm/pwm-ab8500.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/pwm/pwm-ab8500.c b/drivers/pwm/pwm-ab8500.c
-index fdf3964db4a6..2023592a4a54 100644
---- a/drivers/pwm/pwm-ab8500.c
-+++ b/drivers/pwm/pwm-ab8500.c
-@@ -101,7 +101,7 @@ static int ab8500_pwm_probe(struct platform_device *pdev)
- 
-       ab8500->chip.dev = &pdev->dev;
-       ab8500->chip.ops = &ab8500_pwm_ops;
--      ab8500->chip.base = pdev->id;
-+      ab8500->chip.base = -1;
-       ab8500->chip.npwm = 1;
- 
-       err = pwmchip_add(&ab8500->chip);
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 94642d0ce059c40150693c9b5e4eb5806c0dc7eb..1ea05824705a02be7a0a293a40ed3c26c9f41818 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -154,7 +154,6 @@ pwm-sifive-simplify-offset-calculation-for-pwmcmp-re.patch
 pwm-sifive-ensure-the-clk-is-enabled-exactly-once-pe.patch
 pwm-sifive-shut-down-hardware-only-after-pwmchip_rem.patch
 pwm-lpc18xx-sct-convert-to-devm_platform_ioremap_res.patch
-pwm-ab8500-explicitly-allocate-pwm-chip-base-dynamic.patch
 drm-bridge-tc358767-move-e-dp-bridge-endpoint-parsin.patch
 drm-bridge-tc358767-make-sure-refclk-clock-are-enabl.patch
 ath10k-do-not-enforce-interrupt-trigger-type.patch