Merge branch 'main' of https://github.com/CirrusLogic/linux-firmware

Signed-off-by: Josh Boyer <jwboyer@kernel.org>
diff --git a/WHENCE b/WHENCE
index 59b6ace..61da344 100644
--- a/WHENCE
+++ b/WHENCE
@@ -1104,22 +1104,6 @@
 
 --------------------------------------------------------------------------
 
-Driver: cx231xx - Conexant Cx23100/101/102 USB broadcast A/V decoder
-
-File: v4l-cx231xx-avcore-01.fw
-
-Licence: Redistributable.
-
-  Conexant grants permission to use and redistribute these firmware
-  files for use with Conexant devices, but not as a part of the Linux
-  kernel or in any other form which would require these files themselves
-  to be covered by the terms of the GNU General Public License.
-  These firmware files are distributed in the hope that they will be
-  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
---------------------------------------------------------------------------
-
 Driver: tehuti - Tehuti Networks 10G Ethernet
 
 File: tehuti/bdx.bin
@@ -1274,40 +1258,20 @@
 
 --------------------------------------------------------------------------
 
+Driver: cx231xx - Conexant Cx23100/101/102 USB broadcast A/V decoder
+
+File: v4l-cx231xx-avcore-01.fw
+
 Driver: cx23418 - Conexant PCI Broadcast A/V with MPEG encoder
 
 File: v4l-cx23418-apu.fw
 File: v4l-cx23418-cpu.fw
 File: v4l-cx23418-dig.fw
 
-Licence: Redistributable.
-
-  Conexant grants permission to use and redistribute these firmware
-  files for use with Conexant devices, but not as a part of the Linux
-  kernel or in any other form which would require these files themselves
-  to be covered by the terms of the GNU General Public License.
-  These firmware files are distributed in the hope that they will be
-  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
---------------------------------------------------------------------------
-
 Driver: cx23885 - Conexant PCI Express Broadcast A/V decoder
 
 File: v4l-cx23885-avcore-01.fw
 
-Licence: Redistributable.
-
-  Conexant grants permission to use and redistribute these firmware
-  files for use with Conexant devices, but not as a part of the Linux
-  kernel or in any other form which would require these files themselves
-  to be covered by the terms of the GNU General Public License.
-  These firmware files are distributed in the hope that they will be
-  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
---------------------------------------------------------------------------
-
 Driver: cx23840 - Conexant sideport Broadcast A/V decoder
 
 File: v4l-cx25840.fw
@@ -3695,69 +3659,69 @@
 File: intel/ibt-18-1.ddc
 Version: BT_ThunderPeak_A0_B0_REL0201
 File:intel/ibt-20-0-3.sfi
-Version: BT_CyclonePeak_A0_REL53263
+Version: BT_CyclonePeak_A0_REL53392
 File:intel/ibt-20-0-3.ddc
-Version: BT_CyclonePeak_A0_REL53263
+Version: BT_CyclonePeak_A0_REL53392
 File:intel/ibt-20-1-3.sfi
-Version: BT_CyclonePeak_A0_REL53263
+Version: BT_CyclonePeak_A0_REL53392
 File:intel/ibt-20-1-3.ddc
-Version: BT_CyclonePeak_A0_REL53263
+Version: BT_CyclonePeak_A0_REL53392
 File:intel/ibt-20-1-4.sfi
-Version: BT_CyclonePeak_A0_REL53263
+Version: BT_CyclonePeak_A0_REL53392
 File:intel/ibt-20-1-4.ddc
-Version: BT_CyclonePeak_A0_REL53263
+Version: BT_CyclonePeak_A0_REL53392
 File:intel/ibt-19-0-0.sfi
-Version: BT_Quasar_REL53263
+Version: BT_Quasar_REL53392
 File:intel/ibt-19-0-0.ddc
-Version: BT_Quasar_REL53263
+Version: BT_Quasar_REL53392
 File:intel/ibt-19-0-1.sfi
-Version: BT_Quasar_REL53263
+Version: BT_Quasar_REL53392
 File:intel/ibt-19-0-1.ddc
-Version: BT_Quasar_REL53263
+Version: BT_Quasar_REL53392
 File:intel/ibt-19-0-3.sfi
 Version: BT_Quasar_REL53263
 File:intel/ibt-19-0-3.ddc
 Version: BT_Quasar_REL53263
 File:intel/ibt-19-0-4.sfi
-Version: BT_HarrisonPeak_REL53263
+Version: BT_HarrisonPeak_REL53392
 File:intel/ibt-19-0-4.ddc
-Version: BT_HarrisonPeak_REL53263
+Version: BT_HarrisonPeak_REL53392
 File:intel/ibt-19-16-4.sfi
-Version: BT_HarrisonPeak_REL53263
+Version: BT_HarrisonPeak_REL53392
 File:intel/ibt-19-16-4.ddc
-Version: BT_HarrisonPeak_REL53263
+Version: BT_HarrisonPeak_REL53392
 File:intel/ibt-19-32-1.sfi
-Version: BT_HarrisonPeak_REL53263
+Version: BT_HarrisonPeak_REL53392
 File:intel/ibt-19-32-1.ddc
-Version: BT_HarrisonPeak_REL53263
+Version: BT_HarrisonPeak_REL53392
 File:intel/ibt-19-32-0.sfi
-Version: BT_HarrisonPeak_REL53263
+Version: BT_HarrisonPeak_REL53392
 File:intel/ibt-19-32-0.ddc
-Version: BT_HarrisonPeak_REL53263
+Version: BT_HarrisonPeak_REL53392
 File:intel/ibt-19-32-4.sfi
-Version: BT_HarrisonPeak_REL53263
+Version: BT_HarrisonPeak_REL53392
 File:intel/ibt-19-32-4.ddc
-Version: BT_HarrisonPeak_REL53263
+Version: BT_HarrisonPeak_REL53392
 File:intel/ibt-19-240-1.sfi
-Version: BT_HarrisonPeak_REL53263
+Version: BT_HarrisonPeak_REL53392
 File:intel/ibt-19-240-1.ddc
-Version: BT_HarrisonPeak_REL53263
+Version: BT_HarrisonPeak_REL53392
 File:intel/ibt-19-240-4.sfi
-Version: BT_HarrisonPeak_REL53263
+Version: BT_HarrisonPeak_REL53392
 File:intel/ibt-19-240-4.ddc
-Version: BT_HarrisonPeak_REL53263
+Version: BT_HarrisonPeak_REL53392
 File:intel/ibt-0041-0041.sfi
-Version: BT_TyphoonPeak_REL59564
+Version: BT_TyphoonPeak_REL62562
 File:intel/ibt-0041-0041.ddc
-Version: BT_TyphoonPeak_REL59564
+Version: BT_TyphoonPeak_REL62562
 File:intel/ibt-0040-0041.sfi
-Version: BT_Solar_GfP2_REL59564
+Version: BT_Solar_GfP2_REL62562
 File:intel/ibt-0040-0041.ddc
-Version: BT_Solar_GfP2_REL59564
+Version: BT_Solar_GfP2_REL62562
 File:intel/ibt-1040-0041.sfi
-Version: BT_SolarF_GfP2_REL59564
+Version: BT_SolarF_GfP2_REL62562
 File:intel/ibt-1040-0041.ddc
-Version: BT_SolarF_GfP2_REL59564
+Version: BT_SolarF_GfP2_REL62562
 
 File:intel/ibt-0040-1020.sfi
 Version: BT_Solar_JfP1_REL59564
@@ -3778,13 +3742,13 @@
 Version: BT_SolarF_JfP2_REL59564
 
 File:intel/ibt-0040-4150.sfi
-Version: BT_Solar_JnP2_REL59564
+Version: BT_Solar_JnP2_REL62562
 File:intel/ibt-0040-4150.ddc
-Version: BT_Solar_JnP2_REL59564
+Version: BT_Solar_JnP2_REL62562
 File:intel/ibt-1040-4150.sfi
-Version: BT_SolarF_JnP2_REL59564
+Version: BT_SolarF_JnP2_REL62562
 File:intel/ibt-1040-4150.ddc
-Version: BT_SolarF_JnP2_REL59564
+Version: BT_SolarF_JnP2_REL62562
 
 Licence: Redistributable. See LICENCE.ibt_firmware for details
 
@@ -3830,18 +3794,11 @@
 From https://github.com/troy-tan/driver_store
 Files rtl_bt/rtl8822b_* came directly from Realtek. These files are
 updated on April 14, 2017.
-Files rtl_bt/rtl8821c_* and rtl_bt/rtl8723d_* came directly from Realtek.
-File rtl_bt/rtl8822cu_fw.bin came directly from Realtek.
-updated on February 24, 2019
-File rtl_bt/rtl8822cu_fw.bin came directly from Realtek.
-updated on October 23, 2019
-File rtl_bt/rtl8822cu_config.bin came directly from Realtek.
 
 Found in vendor driver, 20200806_LINUX_BT_DRIVER_RTL8761B_COEX_v0202.zip
-File rtl_bt/rtl8761b_fw.bin
 File rtl_bt/rtl8761b_config.bin
-File rtl_bt/rtl8761bu_fw.bin
 File rtl_bt/rtl8761bu_config.bin
+
 --------------------------------------------------------------------------
 
 Driver: btmtk_usb - Bluetooth USB driver
@@ -4317,6 +4274,8 @@
 File: qca/msbtfw11.mbn
 File: qca/msbtfw11.tlv
 File: qca/msnv11.bin
+File: qca/msnv11.b0a
+File: qca/msnv11.b09
 
 Licence: Redistributable. See LICENSE.QualcommAtheros_ath10k and qca/NOTICE.txt for details
 
@@ -4721,6 +4680,9 @@
 File: i915/mtl_dmc.bin
 Version: DMC API/APB ver 2 release 12 for Meteorlake
 
+File: i915/mtl_guc_70.bin
+Version: GuC API/APB ver 70.6.6 for Meteorlake
+
 License: Redistributable. See LICENSE.i915 for details
 --------------------------------------------------------------------------
 
@@ -5222,8 +5184,9 @@
 Version: 20180621204904
 File: mediatek/mt7668pr2h.bin
 Version: 20180517181834
-File: mediatek/mt7663pr2h.bin
-Version: 7663e2ccn04-2006030247
+# Note: explicitly commented out, since it's duplicated further down
+# File: mediatek/mt7663pr2h.bin
+# Version: 7663e2ccn04-2006030247
 
 Licence: Redistributable. See LICENCE.mediatek for details.
 
@@ -5367,6 +5330,8 @@
 Version: 20221208202048
 File: mediatek/mt7981_rom_patch.bin
 Version: 20221208201745a
+File: mediatek/mt7981_wo.bin
+Version: 20221208202138
 
 Licence: Redistributable. See LICENCE.mediatek for details.
 
@@ -5395,9 +5360,9 @@
 Driver: mt7922 - MediaTek MT7922 Wireless MACs
 
 File: mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin
-Version: 20230328143229a
+Version: 20230509203612a
 File: mediatek/WIFI_RAM_CODE_MT7922_1.bin
-Version: 20230328143313
+Version: 20230509203655
 
 Licence: Redistributable. See LICENCE.mediatek for details.
 
@@ -5406,7 +5371,7 @@
 Driver: mt7922 - MediaTek MT7922 bluetooth chipset
 
 File: mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin
-Version: 20230328143444
+Version: 20230509203838
 
 Licence: Redistributable. See LICENCE.mediatek for details.
 
diff --git a/amdgpu/dcn_3_1_6_dmcub.bin b/amdgpu/dcn_3_1_6_dmcub.bin
index d101a63..c8fcdfc 100644
--- a/amdgpu/dcn_3_1_6_dmcub.bin
+++ b/amdgpu/dcn_3_1_6_dmcub.bin
Binary files differ
diff --git a/check_whence.py b/check_whence.py
index 8805e99..711be36 100755
--- a/check_whence.py
+++ b/check_whence.py
@@ -28,6 +28,14 @@
                         yield match.group(2)
                         continue
 
+def list_whence_files():
+    with open('WHENCE', encoding='utf-8') as whence:
+        for line in whence:
+            match = re.match(r'File:\s*(.*)', line)
+            if match:
+                yield match.group(1).replace("\ ", " ")
+                continue
+
 def list_git():
     with os.popen('git ls-files') as git_files:
         for line in git_files:
@@ -36,12 +44,22 @@
 def main():
     ret = 0
     whence_list = list(list_whence())
+    whence_files = list(list_whence_files())
     known_files = set(name for name in whence_list if not name.endswith('/')) | \
                   set(['check_whence.py', 'configure', 'Makefile',
                        'README', 'copy-firmware.sh', 'WHENCE'])
     known_prefixes = set(name for name in whence_list if name.endswith('/'))
     git_files = set(list_git())
 
+    for name in set(name for name in whence_files if name.endswith('/')):
+        sys.stderr.write('E: %s listed in WHENCE as File, but is directory\n' %
+                         name)
+        ret = 1
+
+    for name in set(fw for fw in whence_files if whence_files.count(fw) > 1):
+        sys.stderr.write('E: %s listed in WHENCE twice\n' % name)
+        ret = 1
+
     for name in sorted(list(known_files - git_files)):
         sys.stderr.write('E: %s listed in WHENCE does not exist\n' % name)
         ret = 1
diff --git a/cnm/wave521c_k3_codec_fw.bin b/cnm/wave521c_k3_codec_fw.bin
index 4e1b17b..09b67c1 100644
--- a/cnm/wave521c_k3_codec_fw.bin
+++ b/cnm/wave521c_k3_codec_fw.bin
Binary files differ
diff --git a/i915/mtl_guc_70.bin b/i915/mtl_guc_70.bin
new file mode 100644
index 0000000..618b1fa
--- /dev/null
+++ b/i915/mtl_guc_70.bin
Binary files differ
diff --git a/intel/ibt-0040-0041.sfi b/intel/ibt-0040-0041.sfi
index b9227a6..bb73fd9 100644
--- a/intel/ibt-0040-0041.sfi
+++ b/intel/ibt-0040-0041.sfi
Binary files differ
diff --git a/intel/ibt-0040-4150.sfi b/intel/ibt-0040-4150.sfi
index ec8f75d..f9f5e1b 100644
--- a/intel/ibt-0040-4150.sfi
+++ b/intel/ibt-0040-4150.sfi
Binary files differ
diff --git a/intel/ibt-0041-0041.sfi b/intel/ibt-0041-0041.sfi
index e3a197b..c864e3e 100644
--- a/intel/ibt-0041-0041.sfi
+++ b/intel/ibt-0041-0041.sfi
Binary files differ
diff --git a/intel/ibt-1040-0041.sfi b/intel/ibt-1040-0041.sfi
index 004011a..ea7dd25 100644
--- a/intel/ibt-1040-0041.sfi
+++ b/intel/ibt-1040-0041.sfi
Binary files differ
diff --git a/intel/ibt-1040-4150.sfi b/intel/ibt-1040-4150.sfi
index d58ceb9..e4dd0f1 100644
--- a/intel/ibt-1040-4150.sfi
+++ b/intel/ibt-1040-4150.sfi
Binary files differ
diff --git a/intel/ibt-19-0-0.sfi b/intel/ibt-19-0-0.sfi
index 3b8f60b..e8761f3 100644
--- a/intel/ibt-19-0-0.sfi
+++ b/intel/ibt-19-0-0.sfi
Binary files differ
diff --git a/intel/ibt-19-0-1.sfi b/intel/ibt-19-0-1.sfi
index 3b8f60b..e8761f3 100644
--- a/intel/ibt-19-0-1.sfi
+++ b/intel/ibt-19-0-1.sfi
Binary files differ
diff --git a/intel/ibt-19-0-4.sfi b/intel/ibt-19-0-4.sfi
index 3b8f60b..e8761f3 100644
--- a/intel/ibt-19-0-4.sfi
+++ b/intel/ibt-19-0-4.sfi
Binary files differ
diff --git a/intel/ibt-19-16-4.sfi b/intel/ibt-19-16-4.sfi
index 3b8f60b..e8761f3 100644
--- a/intel/ibt-19-16-4.sfi
+++ b/intel/ibt-19-16-4.sfi
Binary files differ
diff --git a/intel/ibt-19-240-1.sfi b/intel/ibt-19-240-1.sfi
index 3b8f60b..e8761f3 100644
--- a/intel/ibt-19-240-1.sfi
+++ b/intel/ibt-19-240-1.sfi
Binary files differ
diff --git a/intel/ibt-19-240-4.sfi b/intel/ibt-19-240-4.sfi
index 3b8f60b..e8761f3 100644
--- a/intel/ibt-19-240-4.sfi
+++ b/intel/ibt-19-240-4.sfi
Binary files differ
diff --git a/intel/ibt-19-32-0.sfi b/intel/ibt-19-32-0.sfi
index 3b8f60b..e8761f3 100644
--- a/intel/ibt-19-32-0.sfi
+++ b/intel/ibt-19-32-0.sfi
Binary files differ
diff --git a/intel/ibt-19-32-1.sfi b/intel/ibt-19-32-1.sfi
index 3b8f60b..e8761f3 100644
--- a/intel/ibt-19-32-1.sfi
+++ b/intel/ibt-19-32-1.sfi
Binary files differ
diff --git a/intel/ibt-19-32-4.sfi b/intel/ibt-19-32-4.sfi
index 3b8f60b..e8761f3 100644
--- a/intel/ibt-19-32-4.sfi
+++ b/intel/ibt-19-32-4.sfi
Binary files differ
diff --git a/intel/ibt-20-0-3.sfi b/intel/ibt-20-0-3.sfi
index 12d946c..014a960 100644
--- a/intel/ibt-20-0-3.sfi
+++ b/intel/ibt-20-0-3.sfi
Binary files differ
diff --git a/intel/ibt-20-1-3.sfi b/intel/ibt-20-1-3.sfi
index fbe5231..014a960 100644
--- a/intel/ibt-20-1-3.sfi
+++ b/intel/ibt-20-1-3.sfi
Binary files differ
diff --git a/intel/ibt-20-1-4.sfi b/intel/ibt-20-1-4.sfi
index abb1d1d..90a0502 100644
--- a/intel/ibt-20-1-4.sfi
+++ b/intel/ibt-20-1-4.sfi
Binary files differ
diff --git a/mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin b/mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin
index 3bf4017..54b422e 100644
--- a/mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin
+++ b/mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin
Binary files differ
diff --git a/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin b/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin
index c07a908..40cb158 100644
--- a/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin
+++ b/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin
Binary files differ
diff --git a/mediatek/WIFI_RAM_CODE_MT7922_1.bin b/mediatek/WIFI_RAM_CODE_MT7922_1.bin
index 294b742..80be4c1 100644
--- a/mediatek/WIFI_RAM_CODE_MT7922_1.bin
+++ b/mediatek/WIFI_RAM_CODE_MT7922_1.bin
Binary files differ
diff --git a/mediatek/mt7981_wo.bin b/mediatek/mt7981_wo.bin
new file mode 100644
index 0000000..aaf9865
--- /dev/null
+++ b/mediatek/mt7981_wo.bin
Binary files differ
diff --git a/qca/msbtfw11.mbn b/qca/msbtfw11.mbn
index 964ec5d..1599e90 100644
--- a/qca/msbtfw11.mbn
+++ b/qca/msbtfw11.mbn
Binary files differ
diff --git a/qca/msbtfw11.tlv b/qca/msbtfw11.tlv
index 8afa42c..21b0dee 100644
--- a/qca/msbtfw11.tlv
+++ b/qca/msbtfw11.tlv
Binary files differ
diff --git a/qca/msnv11.b09 b/qca/msnv11.b09
new file mode 100755
index 0000000..55a5036
--- /dev/null
+++ b/qca/msnv11.b09
Binary files differ
diff --git a/qca/msnv11.b0a b/qca/msnv11.b0a
new file mode 100755
index 0000000..d1a9b43
--- /dev/null
+++ b/qca/msnv11.b0a
Binary files differ
diff --git a/qca/msnv11.bin b/qca/msnv11.bin
index c36f877..4c46745 100644
--- a/qca/msnv11.bin
+++ b/qca/msnv11.bin
Binary files differ
diff --git a/rtl_bt/rtl8761b_fw.bin b/rtl_bt/rtl8761b_fw.bin
index 4b04eb6..aa99594 100644
--- a/rtl_bt/rtl8761b_fw.bin
+++ b/rtl_bt/rtl8761b_fw.bin
Binary files differ
diff --git a/rtl_bt/rtl8761bu_fw.bin b/rtl_bt/rtl8761bu_fw.bin
index d042bb1..1dc433e 100644
--- a/rtl_bt/rtl8761bu_fw.bin
+++ b/rtl_bt/rtl8761bu_fw.bin
Binary files differ
diff --git a/rtl_bt/rtl8852bu_fw.bin b/rtl_bt/rtl8852bu_fw.bin
index 1d44610..2636ae5 100644
--- a/rtl_bt/rtl8852bu_fw.bin
+++ b/rtl_bt/rtl8852bu_fw.bin
Binary files differ
diff --git a/rtl_nic/rtl8153b-2.fw b/rtl_nic/rtl8153b-2.fw
index 7ca22a6..bb8e16a 100644
--- a/rtl_nic/rtl8153b-2.fw
+++ b/rtl_nic/rtl8153b-2.fw
Binary files differ
diff --git a/rtl_nic/rtl8156a-2.fw b/rtl_nic/rtl8156a-2.fw
index eec923b..5012cd2 100644
--- a/rtl_nic/rtl8156a-2.fw
+++ b/rtl_nic/rtl8156a-2.fw
Binary files differ
diff --git a/rtl_nic/rtl8156b-2.fw b/rtl_nic/rtl8156b-2.fw
index 7bf4dda..417fbd3 100644
--- a/rtl_nic/rtl8156b-2.fw
+++ b/rtl_nic/rtl8156b-2.fw
Binary files differ