drop queue-5.4/arm64-dts-qcom-msm8998-mtp-add-alias-for-blsp1_uart3.patch

diff --git a/queue-5.4/arm64-dts-qcom-msm8998-mtp-add-alias-for-blsp1_uart3.patch b/queue-5.4/arm64-dts-qcom-msm8998-mtp-add-alias-for-blsp1_uart3.patch
deleted file mode 100644 (file)
index 4fa3cae..0000000
--- a/queue-5.4/arm64-dts-qcom-msm8998-mtp-add-alias-for-blsp1_uart3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c9ec155b5962233aff3df65210bd6a4788dee21c Mon Sep 17 00:00:00 2001
-From: Bjorn Andersson <bjorn.andersson@linaro.org>
-Date: Mon, 18 Nov 2019 17:18:23 -0800
-Subject: arm64: dts: qcom: msm8998-mtp: Add alias for blsp1_uart3
-
-From: Bjorn Andersson <bjorn.andersson@linaro.org>
-
-commit c9ec155b5962233aff3df65210bd6a4788dee21c upstream.
-
-The msm_serial driver has a predefined set of uart ports defined, which
-is allocated either by reading aliases or if no match is found a simple
-counter, starting at index 0. But there's no logic in place to prevent
-these two allocation mechanism from colliding. As a result either none
-or all of the active msm_serial instances must be listed as aliases.
-
-Define blsp1_uart3 as "serial1" to mitigate this problem.
-
-Fixes: 4cffb9f2c700 ("arm64: dts: qcom: msm8998-mtp: Enable bluetooth")
-Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Reviewed-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>
-Link: https://lore.kernel.org/r/20191119011823.379100-1-bjorn.andersson@linaro.org
-Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
-@@ -9,6 +9,7 @@
- / {
-       aliases {
-               serial0 = &blsp2_uart1;
-+              serial1 = &blsp1_uart3;
-       };
- 
-       chosen {

diff --git a/queue-5.4/series b/queue-5.4/series
index 0fb65edf9ff947681b018ba5af8feb99e765d1ed..aea44656609e823a9481a85367aea993c7e16da6 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -40,7 +40,6 @@ arc-add-missing-multicast-filter-number-to-gmac-node.patch
 platform-x86-intel_mid_powerbtn-take-a-copy-of-ddata.patch
 arm64-dts-qcom-msm8998-fix-tcsr-syscon-size.patch
 arm64-dts-udpu-fix-broken-ethernet.patch
-arm64-dts-qcom-msm8998-mtp-add-alias-for-blsp1_uart3.patch
 arm-dts-at91-reenable-uart-tx-pull-ups.patch
 arm-dts-am43xx-add-support-for-clkout1-clock.patch
 arm64-dts-renesas-r8a77990-ebisu-remove-clkout-lr-synchronous-from-sound.patch