drop queue-5.10/tty-serial-meson-retrieve-port-fifo-size-from-dt.patch

It's a duplicate

diff --git a/queue-5.10/series b/queue-5.10/series
index 91e38817062cd10e0c8332c54d92f44cc3494110..597df59491724e560ec46815b926d3b5852d713a 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -4,7 +4,6 @@ net-r8169-disable-multicast-filter-for-rtl8168h-and-.patch
 drm-amdgpu-fix-a-null-pointer-access-when-the-smc_rr.patch
 i2c-sun6i-p2wi-prevent-potential-division-by-zero.patch
 media-imon-fix-access-to-invalid-resource-for-the-se.patch
-tty-serial-meson-retrieve-port-fifo-size-from-dt.patch
 revert-net-r8169-disable-multicast-filter-for-rtl816.patch
 afs-fix-afs_server_list-to-be-cleaned-up-with-rcu.patch
 afs-make-error-on-cell-lookup-failure-consistent-wit.patch

diff --git a/queue-5.10/tty-serial-meson-retrieve-port-fifo-size-from-dt.patch b/queue-5.10/tty-serial-meson-retrieve-port-fifo-size-from-dt.patch
deleted file mode 100644 (file)
index dd16055..0000000
--- a/queue-5.10/tty-serial-meson-retrieve-port-fifo-size-from-dt.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From edbcc63ffa6dee7fad8a540dd84edce15833a079 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 18 May 2021 09:58:32 +0200
-Subject: tty: serial: meson: retrieve port FIFO size from DT
-
-From: Neil Armstrong <narmstrong@baylibre.com>
-
-[ Upstream commit 27d44e05d7b85d9d4cfe0a3c0663ea49752ece93 ]
-
-Now the DT bindings has a property to get the FIFO size for a particular port,
-retrieve it and use to setup the FIFO interrupts threshold.
-
-Reviewed-by: Kevin Hilman <khilman@baylibre.com>
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-Link: https://lore.kernel.org/r/20210518075833.3736038-3-narmstrong@baylibre.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Stable-dep-of: 2a1d728f20ed ("tty: serial: meson: fix hard LOCKUP on crtscts mode")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/tty/serial/meson_uart.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
-index bb66a3f06626c..c44ab21a9b7dd 100644
---- a/drivers/tty/serial/meson_uart.c
-+++ b/drivers/tty/serial/meson_uart.c
-@@ -765,6 +765,8 @@ static int meson_uart_probe(struct platform_device *pdev)
-       of_property_read_u32(pdev->dev.of_node, "fifo-size", &fifosize);
-       has_rtscts = of_property_read_bool(pdev->dev.of_node, "uart-has-rtscts");
- 
-+      of_property_read_u32(pdev->dev.of_node, "fifo-size", &fifosize);
-+
-       if (meson_ports[pdev->id]) {
-               dev_err(&pdev->dev, "port %d already allocated\n", pdev->id);
-               return -EBUSY;
--- 
-2.42.0
-