diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Enable-adsp-.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Enable-adsp-.patch new file mode 100644 index 0000000..e7bade4 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0001-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Enable-adsp-.patch @@ -0,0 +1,42 @@ +From dce3ba85d15d0256d51c624ac82e6487f51c82bc Mon Sep 17 00:00:00 2001 +From: Bjorn Andersson +Date: Tue, 26 Mar 2024 19:04:20 -0700 +Subject: [PATCH 1/3] UPSTREAM: arm64: dts: qcom: qcs6490-rb3gen2: Enable adsp + and cdsp + +Define firmware paths and enable the ADSP and CDSP remoteprocs. + +Signed-off-by: Bjorn Andersson +Reviewed-by: Dmitry Baryshkov +Link: https://lore.kernel.org/r/20240326-rb3gen2-dp-connector-v2-3-a9f1bc32ecaf@quicinc.com +Signed-off-by: Bjorn Andersson + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 3eb0b024decf99f917509db124f399dc47894075] +--- + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +index 903ee11c98df..309e03bd2c9a 100644 +--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts ++++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +@@ -439,6 +439,16 @@ &qupv3_id_0 { + status = "okay"; + }; + ++&remoteproc_adsp { ++ firmware-name = "qcom/qcs6490/adsp.mbn"; ++ status = "okay"; ++}; ++ ++&remoteproc_cdsp { ++ firmware-name = "qcom/qcs6490/cdsp.mbn"; ++ status = "okay"; ++}; ++ + &tlmm { + gpio-reserved-ranges = <32 2>, /* ADSP */ + <48 4>; /* NFC */ +-- +2.25.1 + diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Enable-vario.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Enable-vario.patch new file mode 100644 index 0000000..8993a94 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0002-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Enable-vario.patch @@ -0,0 +1,50 @@ +From d8e17f697bcdf398ea177b6ac28756cfd3f6c586 Mon Sep 17 00:00:00 2001 +From: Komal Bajaj +Date: Wed, 17 Apr 2024 17:39:28 +0530 +Subject: [PATCH 2/3] UPSTREAM: arm64: dts: qcom: qcs6490-rb3gen2: Enable + various remoteprocs + +Enable the ADSP, CDSP and WPSS that are found on qcs6490-rb3gen2. + +Signed-off-by: Komal Bajaj +Reviewed-by: Dmitry Baryshkov +Link: https://lore.kernel.org/r/20240417120928.32344-3-quic_kbajaj@quicinc.com +Signed-off-by: Bjorn Andersson + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git ac6d35b9b74c113753bd266e01d6b853618a1e37] +--- + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +index 309e03bd2c9a..36693977c4c1 100644 +--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts ++++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +@@ -17,7 +17,6 @@ + #include "pmk8350.dtsi" + + /delete-node/ &ipa_fw_mem; +-/delete-node/ &remoteproc_mpss; + /delete-node/ &rmtfs_mem; + /delete-node/ &adsp_mem; + /delete-node/ &cdsp_mem; +@@ -449,6 +448,16 @@ &remoteproc_cdsp { + status = "okay"; + }; + ++&remoteproc_mpss { ++ firmware-name = "qcom/qcs6490/modem.mbn"; ++ status = "okay"; ++}; ++ ++&remoteproc_wpss { ++ firmware-name = "qcom/qcs6490/wpss.mbn"; ++ status = "okay"; ++}; ++ + &tlmm { + gpio-reserved-ranges = <32 2>, /* ADSP */ + <48 4>; /* NFC */ +-- +2.25.1 + diff --git a/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0003-UPSTREAM-arm64-dts-qcom-qcm6490-idp-Enable-various-r.patch b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0003-UPSTREAM-arm64-dts-qcom-qcm6490-idp-Enable-various-r.patch new file mode 100644 index 0000000..5612429 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/qcm6490-board-dts/0003-UPSTREAM-arm64-dts-qcom-qcm6490-idp-Enable-various-r.patch @@ -0,0 +1,51 @@ +From 22a42aa02019bb4d0c58209cd86d453421f82135 Mon Sep 17 00:00:00 2001 +From: Komal Bajaj +Date: Wed, 17 Apr 2024 17:39:27 +0530 +Subject: [PATCH 3/3] UPSTREAM: arm64: dts: qcom: qcm6490-idp: Enable various + remoteprocs + +Enable the ADSP, CDSP, MPSS and WPSS that are found on the SoC. + +Signed-off-by: Komal Bajaj +Link: https://lore.kernel.org/r/20240417120928.32344-2-quic_kbajaj@quicinc.com +Signed-off-by: Bjorn Andersson + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 99a1c9eedf6098826c0f9dcbda2c23e5dad20244] +--- + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts +index f45573f80ca4..1cf23184fdfe 100644 +--- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts ++++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts +@@ -445,6 +445,26 @@ &qupv3_id_0 { + status = "okay"; + }; + ++&remoteproc_adsp { ++ firmware-name = "qcom/qcm6490/adsp.mbn"; ++ status = "okay"; ++}; ++ ++&remoteproc_cdsp { ++ firmware-name = "qcom/qcm6490/cdsp.mbn"; ++ status = "okay"; ++}; ++ ++&remoteproc_mpss { ++ firmware-name = "qcom/qcm6490/modem.mbn"; ++ status = "okay"; ++}; ++ ++&remoteproc_wpss { ++ firmware-name = "qcom/qcm6490/wpss.mbn"; ++ status = "okay"; ++}; ++ + &sdhc_1 { + non-removable; + no-sd; +-- +2.25.1 + diff --git a/recipes-kernel/linux/linux-yocto_6.6.bbappend b/recipes-kernel/linux/linux-yocto_6.6.bbappend index 293936b..e6c3b31 100644 --- a/recipes-kernel/linux/linux-yocto_6.6.bbappend +++ b/recipes-kernel/linux/linux-yocto_6.6.bbappend @@ -77,6 +77,9 @@ SRC_URI:append:qcom = " \ file://qcm6490-board-dts/0001-UPSTREAM-arm64-dts-qcom-sc7280-move-MPSS-and-WPSS-me.patch \ file://qcm6490-board-dts/0002-UPSTREAM-arm64-dts-qcom-sc7280-Add-ADSP-node.patch \ file://qcm6490-board-dts/0003-UPSTREAM-arm64-dts-qcom-sc7280-Add-CDSP-node.patch \ + file://qcm6490-board-dts/0001-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Enable-adsp-.patch \ + file://qcm6490-board-dts/0002-UPSTREAM-arm64-dts-qcom-qcs6490-rb3gen2-Enable-vario.patch \ + file://qcm6490-board-dts/0003-UPSTREAM-arm64-dts-qcom-qcm6490-idp-Enable-various-r.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 \ file://workarounds/0002-PENDING-arm64-dts-qcom-Remove-voltage-vote-support-f.patch \