From 71c3d7d1e67b8a386ada8b29e91b7272838bed71 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Thu, 7 Dec 2023 14:07:07 +0300 Subject: [PATCH] linux-yocto-6.5: drop applied patch The patch 0001-arm64-dts-qcom-qrb2210-rb1-Swap-UART-index.patch was applied to the 6.5 stable tree, drop it from the recipe. Signed-off-by: Dmitry Baryshkov --- ...dts-qcom-qrb2210-rb1-Swap-UART-index.patch | 47 ------------------- recipes-kernel/linux/linux-yocto_6.5.bbappend | 1 - 2 files changed, 48 deletions(-) delete mode 100644 recipes-kernel/linux/linux-yocto/0001-arm64-dts-qcom-qrb2210-rb1-Swap-UART-index.patch diff --git a/recipes-kernel/linux/linux-yocto/0001-arm64-dts-qcom-qrb2210-rb1-Swap-UART-index.patch b/recipes-kernel/linux/linux-yocto/0001-arm64-dts-qcom-qrb2210-rb1-Swap-UART-index.patch deleted file mode 100644 index 6f09a6c..0000000 --- a/recipes-kernel/linux/linux-yocto/0001-arm64-dts-qcom-qrb2210-rb1-Swap-UART-index.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 973c015facabcbd320063648010942c51992c1a1 Mon Sep 17 00:00:00 2001 -From: Konrad Dybcio -Date: Wed, 6 Sep 2023 11:24:55 +0200 -Subject: [PATCH] arm64: dts: qcom: qrb2210-rb1: Swap UART index - -Newer RB1 board revisions have a debug UART on QUP0. Sadly, it looks -like even when ordering one in retail, customers receive prototype -boards with "Enginering Sample" written on them. - -Use QUP4 for UART to make all known RB1 boards boot. - -Fixes: e18771961336 ("arm64: dts: qcom: Add initial QTI RB1 device tree") -Signed-off-by: Konrad Dybcio -Reviewed-by: Dmitry Baryshkov -Reported-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20230906-topic-rb1_features_sans_icc-v1-1-e92ce6fbde16@linaro.org -Signed-off-by: Bjorn Andersson -Upstream-Status: Backport 6.7-rc1 ---- - arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts b/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts -index eadba066972e..5cda5b761455 100644 ---- a/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts -+++ b/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts -@@ -13,7 +13,7 @@ / { - compatible = "qcom,qrb2210-rb1", "qcom,qrb2210", "qcom,qcm2290"; - - aliases { -- serial0 = &uart0; -+ serial0 = &uart4; - sdhc1 = &sdhc_1; - sdhc2 = &sdhc_2; - }; -@@ -357,7 +357,7 @@ key_volp_n: key-volp-n-state { - }; - - /* UART connected to the Micro-USB port via a FTDI chip */ --&uart0 { -+&uart4 { - compatible = "qcom,geni-debug-uart"; - status = "okay"; - }; --- -2.42.0 - diff --git a/recipes-kernel/linux/linux-yocto_6.5.bbappend b/recipes-kernel/linux/linux-yocto_6.5.bbappend index c89de0e..6899177 100644 --- a/recipes-kernel/linux/linux-yocto_6.5.bbappend +++ b/recipes-kernel/linux/linux-yocto_6.5.bbappend @@ -1,6 +1,5 @@ SRC_URI:append:qcom = " \ - file://0001-arm64-dts-qcom-qrb2210-rb1-Swap-UART-index.patch \ file://0001-arm64-dts-qcom-qcm2290-temporarily-disable-cluster-i.patch \ file://qca6390-driver/0001-dt-bindings-mfd-qcom-qca639x-add-binding-for-QCA639x.patch \ file://qca6390-driver/0002-mfd-qca639x-add-support-for-QCA639x-powerup-sequence.patch \