db845c: firmware: Update numerous firmware files from linux-firmware

Copy in the latest firmware files from linux-firmware as of
commit ecdfcf8e2ca1 ("Merge branch 'adlp_dmc_firmware'
of git://anongit.freedesktop.org/drm/drm-firmware into main")
from:
  https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/

This fixes the use of new firmware names which was causing
regressions with upstream kernels.

Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I419a15c6f2ce64fa68560000eb273a861e238e17

16 files changed, 63 insertions, 8 deletions

diff --git a/db845c/firmware/Android.mk b/db845c/firmware/Android.mk
index 6c3dc4b..48fa451 100644
--- a/db845c/firmware/Android.mk
+++ b/db845c/firmware/Android.mk
@@ -15,7 +15,8 @@ firmware_files :=	\
     a630_zap.b01	\
     a630_zap.b02	\
     a630_zap.elf	\
-    a630_zap.mdt
+    a630_zap.mdt	\
+    a630_zap.mbn
 
 # DSP (adsp+cdsp)
 sdm845_firmware_files +=	\
@@ -34,6 +35,8 @@ sdm845_firmware_files +=	\
     adsp.b12		\
     adsp.b13		\
     adsp.mdt		\
+    adsp.mbn		\
+    adspr.jsn		\
     adspua.jsn		\
     cdsp.b00		\
     cdsp.b01		\
@@ -43,7 +46,10 @@ sdm845_firmware_files +=	\
     cdsp.b05		\
     cdsp.b06		\
     cdsp.b08		\
-    cdsp.mdt
+    cdsp.mdt		\
+    cdsp.mbn		\
+    cdspr.jsn		\
+
 
 # USB
 firmware_files +=	\
diff --git a/db845c/firmware/a630_zap.mbn b/db845c/firmware/a630_zap.mbn
new file mode 100644
index 0000000..9e6f2ad
--- /dev/null
+++ b/db845c/firmware/a630_zap.mbn
diff --git a/db845c/firmware/adsp.mbn b/db845c/firmware/adsp.mbn
new file mode 100644
index 0000000..271da7f
--- /dev/null
+++ b/db845c/firmware/adsp.mbn
diff --git a/db845c/firmware/adspr.jsn b/db845c/firmware/adspr.jsn
new file mode 100644
index 0000000..0964c15
--- /dev/null
+++ b/db845c/firmware/adspr.jsn
@@ -0,0 +1,21 @@
+{
+    "sr_version": {
+        "major": 1,
+        "minor": 1,
+        "patch": 1
+    },
+    "sr_domain": {
+        "soc": "msm",
+        "domain": "adsp",
+        "subdomain": "root_pd",
+        "qmi_instance_id": 74
+    },
+    "sr_service": [
+        {
+            "provider": "tms",
+            "service": "servreg",
+            "service_data_valid": 0,
+            "service_data": 0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/db845c/firmware/adspua.jsn b/db845c/firmware/adspua.jsn
index e75e83f..2d6824e 100644
--- a/db845c/firmware/adspua.jsn
+++ b/db845c/firmware/adspua.jsn
@@ -24,4 +24,4 @@
             "service_data": 0
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/db845c/firmware/cdsp.mbn b/db845c/firmware/cdsp.mbn
new file mode 100644
index 0000000..a115cc8
--- /dev/null
+++ b/db845c/firmware/cdsp.mbn
diff --git a/db845c/firmware/cdspr.jsn b/db845c/firmware/cdspr.jsn
new file mode 100644
index 0000000..5d976a6
--- /dev/null
+++ b/db845c/firmware/cdspr.jsn
@@ -0,0 +1,21 @@
+{
+    "sr_version": {
+        "major": 1,
+        "minor": 1,
+        "patch": 1
+    },
+    "sr_domain": {
+        "soc": "msm",
+        "domain": "cdsp",
+        "subdomain": "root_pd",
+        "qmi_instance_id": 76
+    },
+    "sr_service": [
+        {
+            "provider": "tms",
+            "service": "servreg",
+            "service_data_valid": 0,
+            "service_data": 0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/db845c/firmware/device.mk b/db845c/firmware/device.mk
index 78a1d8f..e99a32f 100644
--- a/db845c/firmware/device.mk
+++ b/db845c/firmware/device.mk
@@ -9,7 +9,8 @@ PRODUCT_PACKAGES :=	\
     a630_zap.b01	\
     a630_zap.b02	\
     a630_zap.elf	\
-    a630_zap.mdt
+    a630_zap.mdt	\
+    a630_zap.mbn
 
 # DSP (adsp+cdsp)
 PRODUCT_PACKAGES +=	\
@@ -28,6 +29,8 @@ PRODUCT_PACKAGES +=	\
     adsp.b12		\
     adsp.b13		\
     adsp.mdt		\
+    adsp.mbn		\
+    adspr.jsn		\
     adspua.jsn		\
     cdsp.b00		\
     cdsp.b01		\
@@ -37,7 +40,9 @@ PRODUCT_PACKAGES +=	\
     cdsp.b05		\
     cdsp.b06		\
     cdsp.b08		\
-    cdsp.mdt
+    cdsp.mdt		\
+    cdsp.mbn		\
+    cdspr.jsn
 
 # USB (USB Host to PCIE)
 # For Ethernet and one of the USB-A host port to work
@@ -62,7 +67,8 @@ PRODUCT_PACKAGES +=	\
     venus.b02		\
     venus.b03		\
     venus.b04		\
-    venus.mdt
+    venus.mdt		\
+    venus.mbn
 
 # Wlan
 PRODUCT_PACKAGES +=	\
diff --git a/db845c/firmware/modemuw.jsn b/db845c/firmware/modemuw.jsn
index 4322190..88a400e 100644
--- a/db845c/firmware/modemuw.jsn
+++ b/db845c/firmware/modemuw.jsn
@@ -30,4 +30,4 @@
             "service_data": 0
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/db845c/firmware/qcom/venus-5.2/Android.mk b/db845c/firmware/qcom/venus-5.2/Android.mk
index 4047e15..00146a5 100644
--- a/db845c/firmware/qcom/venus-5.2/Android.mk
+++ b/db845c/firmware/qcom/venus-5.2/Android.mk
@@ -8,6 +8,7 @@ firmware_files_venus :=	\
     venus.b02		\
     venus.b03		\
     venus.b04		\
-    venus.mdt
+    venus.mdt		\
+    venus.mbn
 
 $(foreach f, $(firmware_files_venus), $(call add-qcom-firmware, $(f), $(TARGET_OUT_VENDOR)/firmware/qcom/venus-5.2/))
diff --git a/db845c/firmware/qcom/venus-5.2/venus.b00 b/db845c/firmware/qcom/venus-5.2/venus.b00
index 41b63be..96c1762 100644
--- a/db845c/firmware/qcom/venus-5.2/venus.b00
+++ b/db845c/firmware/qcom/venus-5.2/venus.b00
diff --git a/db845c/firmware/qcom/venus-5.2/venus.b01 b/db845c/firmware/qcom/venus-5.2/venus.b01
index a9bae79..cb335f3 100644
--- a/db845c/firmware/qcom/venus-5.2/venus.b01
+++ b/db845c/firmware/qcom/venus-5.2/venus.b01
diff --git a/db845c/firmware/qcom/venus-5.2/venus.b02 b/db845c/firmware/qcom/venus-5.2/venus.b02
index 22052a0..02a4409 100644
--- a/db845c/firmware/qcom/venus-5.2/venus.b02
+++ b/db845c/firmware/qcom/venus-5.2/venus.b02
diff --git a/db845c/firmware/qcom/venus-5.2/venus.b03 b/db845c/firmware/qcom/venus-5.2/venus.b03
index 2ad2108..e5ff59d 100644
--- a/db845c/firmware/qcom/venus-5.2/venus.b03
+++ b/db845c/firmware/qcom/venus-5.2/venus.b03
diff --git a/db845c/firmware/qcom/venus-5.2/venus.mbn b/db845c/firmware/qcom/venus-5.2/venus.mbn
new file mode 100644
index 0000000..0ea5feb
--- /dev/null
+++ b/db845c/firmware/qcom/venus-5.2/venus.mbn
diff --git a/db845c/firmware/qcom/venus-5.2/venus.mdt b/db845c/firmware/qcom/venus-5.2/venus.mdt
index 3e39973..557cf8b 100644
--- a/db845c/firmware/qcom/venus-5.2/venus.mdt
+++ b/db845c/firmware/qcom/venus-5.2/venus.mdt