arm64: dts: qcom: sdm845-oneplus: Update firmware paths

Conform to the new firmware path scheme.
Includes cosmetic cleanups.

Signed-off-by: David Heidelberg <david@ixit.cz>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20251222-oneplus6-new-fw-path-v1-1-a2d366f9eb89@ixit.cz
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index db6dd04c51bb5f5b3a9c1e627359593de6a2f071..f1c63794db979290e871f6639db93df24b3590cb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -181,8 +181,9 @@
 };
 
 &adsp_pas {
+       firmware-name = "qcom/sdm845/OnePlus/enchilada/adsp.mbn";
+
        status = "okay";
-       firmware-name = "qcom/sdm845/oneplus6/adsp.mbn";
 };
 
 &apps_rsc {
@@ -353,8 +354,9 @@
 };
 
 &cdsp_pas {
+       firmware-name = "qcom/sdm845/OnePlus/enchilada/cdsp.mbn";
+
        status = "okay";
-       firmware-name = "qcom/sdm845/oneplus6/cdsp.mbn";
 };
 
 &gcc {
@@ -370,7 +372,7 @@
 };
 
 &gpu_zap_shader {
-       firmware-name = "qcom/sdm845/oneplus6/a630_zap.mbn";
+       firmware-name = "qcom/sdm845/OnePlus/enchilada/a630_zap.mbn";
 };
 
 &i2c10 {
@@ -422,7 +424,8 @@
 &ipa {
        qcom,gsi-loader = "self";
        memory-region = <&ipa_fw_mem>;
-       firmware-name = "qcom/sdm845/oneplus6/ipa_fws.mbn";
+       firmware-name = "qcom/sdm845/OnePlus/enchilada/ipa_fws.mbn";
+
        status = "okay";
 };
 
@@ -474,8 +477,10 @@
 
 /* Modem/wifi */
 &mss_pil {
+       firmware-name = "qcom/sdm845/OnePlus/enchilada/mba.mbn",
+                       "qcom/sdm845/OnePlus/enchilada/modem.mbn";
+
        status = "okay";
-       firmware-name = "qcom/sdm845/oneplus6/mba.mbn", "qcom/sdm845/oneplus6/modem.mbn";
 };
 
 &pm8998_gpios {
@@ -593,7 +598,8 @@
 };
 
 &slpi_pas {
-       firmware-name = "qcom/sdm845/oneplus6/slpi.mbn";
+       firmware-name = "qcom/sdm845/OnePlus/enchilada/slpi.mbn";
+
        status = "okay";
 };
 
@@ -744,7 +750,7 @@
                 * This path is relative to the qca/
                 * subdir under lib/firmware.
                 */
-               firmware-name = "oneplus6/crnv21.bin";
+               firmware-name = "OnePlus/enchilada/crnv21.bin";
 
                vddio-supply = <&vreg_s4a_1p8>;
                vddxo-supply = <&vreg_l7a_1p8>;
@@ -906,8 +912,9 @@
 };
 
 &venus {
+       firmware-name = "qcom/sdm845/OnePlus/enchilada/venus.mbn";
+
        status = "okay";
-       firmware-name = "qcom/sdm845/oneplus6/venus.mbn";
 };
 
 &wcd9340 {