From: Greg Kroah-Hartman Date: Thu, 13 Feb 2020 15:16:00 +0000 (-0800) Subject: drop queue-5.4/arm64-dts-qcom-msm8998-mtp-add-alias-for-blsp1_uart3.patch X-Git-Tag: v4.4.214~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e39c046c0e156500ce172bd4a8d64868c88cb45e;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 4fa3cae3f4c..00000000000 --- 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 -Date: Mon, 18 Nov 2019 17:18:23 -0800 -Subject: arm64: dts: qcom: msm8998-mtp: Add alias for blsp1_uart3 - -From: Bjorn Andersson - -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 -Reviewed-by: Jeffrey Hugo -Link: https://lore.kernel.org/r/20191119011823.379100-1-bjorn.andersson@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Greg Kroah-Hartman - ---- - 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 0fb65edf9ff..aea44656609 100644 --- 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