linux-yocto-dev: update QCM6490-IDP UFS patch

The patch in this layer that enables UFS nodes on the QCM6490-IDP board corresponds to the v2 of the patchset which was rejected upstream (instead of being Pending, as it was incorrectly stated in the Upstream-Status tag). Replace it with the version 3 of the patch, which is has been accepted by Bjorn as is pending for the 6.13 release. Signed-off-by: Dmitry Baryshkov <[email protected]>
qualcomm-linux · Nov 15, 2024 · 3a5139d · 3a5139d
1 parent 3308eb3
commit 3a5139d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -5,7 +5,7 @@ FILESEXTRAPATHS:prepend:qcom := "${THISDIR}/${PN}:"
 
 SRC_URI:append:qcom = " \
     file://qcm6490-board-dts/0001-FROMLIST-arm64-dts-qcom-qcm6490-idp-Update-protected.patch \
-    file://qcm6490-board-dts/0001-PENDING-arm64-dts-qcom-qcm6490-Add-UFS-nodes-for-IDP.patch \
+    file://qcm6490-board-dts/0001-arm64-dts-qcom-qcm6490-Add-UFS-nodes-for-IDP.patch \
     file://workarounds/0001-QCLINUX-arm64-dts-qcom-qcm6490-disable-sdhc1-for-ufs.patch \
     file://workarounds/0001-PENDING-arm64-dts-qcom-Remove-voltage-vote-support-f.patch \
 "

diff --git a/...-qcom-qcm6490-Add-UFS-nodes-for-IDP.patch → ...-dts-qcom-qcm6490-idp-Add-UFS-nodes.patch b/...-qcom-qcm6490-Add-UFS-nodes-for-IDP.patch → ...-dts-qcom-qcm6490-idp-Add-UFS-nodes.patch
@@ -1,25 +1,23 @@
-From b51bcd8342aaaffa4d08fd3474b1512f9992886e Mon Sep 17 00:00:00 2001
+From 5b9d9b910653c53e66c05b9c4dc863d0a1ee14de Mon Sep 17 00:00:00 2001
 From: Manish Pandey <[email protected]>
-Date: Tue, 17 Oct 2023 23:46:10 +0530
-Subject: [PATCH 1/2] PENDING: arm64: dts: qcom: qcm6490: Add UFS nodes for IDP
+Date: Sat, 19 Oct 2024 12:06:59 +0530
+Subject: [PATCH] arm64: dts: qcom: qcm6490-idp: Add UFS nodes
 
-Add UFS host controller and Phy nodes for Qualcomm
-qcm6490 IDP Board.
+Add UFS host controller and Phy nodes for Qualcomm qcm6490-idp board.
 
-Change-Id: If756cf2396ad0d82e7c607738068a634c5a1919a
 Signed-off-by: Manish Pandey <[email protected]>
-Signed-off-by: Salendarsingh Gaud <quic_sgaud@quicinc.com>
-Signed-off-by: Atul Dhudase <[email protected]>
-Upstream-Status: Pending
+Link: https://lore.kernel.org/r/20241019063659.6324-1-quic_mapa@quicinc.com
+Signed-off-by: Bjorn Andersson <[email protected]>
+Upstream-Status: Backport [6.13]
 ---
  arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
-index 3baea71e0248..424cd9c2b092 100644
+index 5f3d4807ac43..c5fb153614e1 100644
 --- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
 +++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
-@@ -463,6 +463,25 @@ &uart5 {
+@@ -702,6 +702,25 @@ &uart5 {
  	status = "okay";
  };
 
@@ -46,5 +44,5 @@ index 3baea71e0248..424cd9c2b092 100644
  	status = "okay";
  };
 -- 
-2.25.1
+2.39.5