drop queue-5.4/pwm-meson-explicitly-set-.polarity-in-.get_state.patch

diff --git a/queue-5.4/pwm-meson-explicitly-set-.polarity-in-.get_state.patch b/queue-5.4/pwm-meson-explicitly-set-.polarity-in-.get_state.patch
deleted file mode 100644 (file)
index f138060..0000000
--- a/queue-5.4/pwm-meson-explicitly-set-.polarity-in-.get_state.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 8caa81eb950cb2e9d2d6959b37d853162d197f57 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
-Date: Wed, 22 Mar 2023 22:45:44 +0100
-Subject: pwm: meson: Explicitly set .polarity in .get_state()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-commit 8caa81eb950cb2e9d2d6959b37d853162d197f57 upstream.
-
-The driver only supports normal polarity. Complete the implementation of
-.get_state() by setting .polarity accordingly.
-
-This fixes a regression that was possible since commit c73a3107624d
-("pwm: Handle .get_state() failures") which stopped to zero-initialize
-the state passed to the .get_state() callback. This was reported at
-https://forum.odroid.com/viewtopic.php?f=177&t=46360 . While this was an
-unintended side effect, the real issue is the driver's callback not
-setting the polarity.
-
-There is a complicating fact, that the .apply() callback fakes support
-for inversed polarity. This is not (and cannot) be matched by
-.get_state(). As fixing this isn't easy, only point it out in a comment
-to prevent authors of other drivers from copying that approach.
-
-Fixes: c375bcbaabdb ("pwm: meson: Read the full hardware state in meson_pwm_get_state()")
-Reported-by: Munehisa Kamata <kamatam@amazon.com>
-Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-Link: https://lore.kernel.org/r/20230310191405.2606296-1-u.kleine-koenig@pengutronix.de
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/pwm/pwm-meson.c |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/pwm/pwm-meson.c
-+++ b/drivers/pwm/pwm-meson.c
-@@ -168,6 +168,12 @@ static int meson_pwm_calc(struct meson_p
-       duty = state->duty_cycle;
-       period = state->period;
- 
-+      /*
-+       * Note this is wrong. The result is an output wave that isn't really
-+       * inverted and so is wrongly identified by .get_state as normal.
-+       * Fixing this needs some care however as some machines might rely on
-+       * this.
-+       */
-       if (state->polarity == PWM_POLARITY_INVERSED)
-               duty = period - duty;
- 
-@@ -304,6 +310,8 @@ static int meson_pwm_apply(struct pwm_ch
-               meson_pwm_enable(meson, pwm);
-       }
- 
-+      state->polarity = PWM_POLARITY_NORMAL;
-+
-       return 0;
- }
- 

diff --git a/queue-5.4/series b/queue-5.4/series
index 8358707d9f4da617c8c07580e6a8bb05339d7ef1..1b286c9dbd84c9430f331cac32ccae44c054743c 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -19,7 +19,6 @@ net-dsa-b53-mmap-add-phy-ops.patch
 s390-ptrace-fix-ptrace_get_last_break-error-handling.patch
 nvme-tcp-fix-a-possible-uaf-when-failing-to-allocate.patch
 xen-netback-use-same-error-messages-for-same-errors.patch
-pwm-meson-explicitly-set-.polarity-in-.get_state.patch
 iio-light-tsl2772-fix-reading-proximity-diodes-from-device-tree.patch
 nilfs2-initialize-unused-bytes-in-segment-summary-blocks.patch
 memstick-fix-memory-leak-if-card-device-is-never-registered.patch