diff --git a/README.build b/README.build
index 6ff2445..82fa111 100644
--- a/README.build
+++ b/README.build
@@ -45,10 +45,6 @@ update-aliases.py:
A program to update aliases.list from the latest kernel RPM
files. Pass kernel RPM files as arguments.
-copy-firmware.sh:
- A helper script to copy the all listed files in WHENCE to the
- destination directory. Used for raw catch-all installation.
-
install-split.sh:
A helper script to copy the files based on WHENCE like the
above, but also to create a file list for each topic in
diff --git a/_servicedata b/_servicedata
index 650d9f2..ce4fbce 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
- 9ed4d42c51aca99d70adc6738d7ea55c5e897835
\ No newline at end of file
+ 84661a3ba62f07e62795f5999c2e8660aae5d122
\ No newline at end of file
diff --git a/aliases.list b/aliases.list
index 8a7f72a..a23939b 100644
--- a/aliases.list
+++ b/aliases.list
@@ -3294,6 +3294,19 @@ qcom_q6v5_pas: of:N*T*Cqcom,sm8450-mpss-pas
qcom_q6v5_pas: of:N*T*Cqcom,sm8450-mpss-pasC*
qcom_q6v5_pas: of:N*T*Cqcom,sm8450-slpi-pas
qcom_q6v5_pas: of:N*T*Cqcom,sm8450-slpi-pasC*
+qede: pci:v00001077d00001634sv*sd*bc*sc*i*
+qede: pci:v00001077d00001636sv*sd*bc*sc*i*
+qede: pci:v00001077d00001644sv*sd*bc*sc*i*
+qede: pci:v00001077d00001654sv*sd*bc*sc*i*
+qede: pci:v00001077d00001656sv*sd*bc*sc*i*
+qede: pci:v00001077d00001664sv*sd*bc*sc*i*
+qede: pci:v00001077d00001666sv*sd*bc*sc*i*
+qede: pci:v00001077d00008070sv*sd*bc*sc*i*
+qede: pci:v00001077d00008090sv*sd*bc*sc*i*
+qedf: pci:v00001077d0000165Csv*sd*bc*sc*i*
+qedf: pci:v00001077d00008080sv*sd*bc*sc*i*
+qedi: pci:v00001077d0000165Esv*sd*bc*sc*i*
+qedi: pci:v00001077d00008084sv*sd*bc*sc*i*
qla1280: pci:v00001077d00001016sv*sd*bc*sc*i*
qla1280: pci:v00001077d00001020sv*sd*bc*sc*i*
qla1280: pci:v00001077d00001080sv*sd*bc*sc*i*
diff --git a/brcm-symlink-fixes.diff b/brcm-symlink-fixes.diff
deleted file mode 100644
index d9921de..0000000
--- a/brcm-symlink-fixes.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/WHENCE b/WHENCE
-index 8ac14500e4ea..90742a7eb1d2 100644
---- a/WHENCE
-+++ b/WHENCE
-@@ -2964,10 +2964,10 @@ Link: brcm/brcmfmac4356-sdio.firefly,firefly-rk3399.txt -> brcmfmac4356-sdio.AP6
- Link: brcm/brcmfmac4356-sdio.khadas,vim2.txt -> brcmfmac4356-sdio.AP6356S.txt
- Link: brcm/brcmfmac4356-sdio.vamrs,rock960.txt -> brcmfmac4356-sdio.AP6356S.txt
- File: brcm/brcmfmac43455-sdio.AW-CM256SM.txt
--Link: brcm/brcmfmac43455-sdio.AW-CM256SM.txt -> brcmfmac43455-sdio.beagle,am5729-beagleboneai.txt
--Link: brcm/brcmfmac43455-sdio.AW-CM256SM.txt -> brcmfmac43455-sdio.pine64,pinebook-pro.txt
--Link: brcm/brcmfmac43455-sdio.AW-CM256SM.txt -> brcmfmac43455-sdio.pine64,pinephone-pro.txt
--Link: brcm/brcmfmac43455-sdio.AW-CM256SM.txt -> brcmfmac43455-sdio.pine64,quartz64-b.txt
-+Link: brcm/brcmfmac43455-sdio.beagle,am5729-beagleboneai.txt -> brcmfmac43455-sdio.AW-CM256SM.txt
-+Link: brcm/brcmfmac43455-sdio.pine64,pinebook-pro.txt -> brcmfmac43455-sdio.AW-CM256SM.txt
-+Link: brcm/brcmfmac43455-sdio.pine64,pinephone-pro.txt -> brcmfmac43455-sdio.AW-CM256SM.txt
-+Link: brcm/brcmfmac43455-sdio.pine64,quartz64-b.txt -> brcmfmac43455-sdio.AW-CM256SM.txt
-
- Licence: GPLv2. See GPL-2 for details.
-
diff --git a/kernel-firmware-20220622.tar.xz b/kernel-firmware-20220622.tar.xz
deleted file mode 100644
index d7b5451..0000000
--- a/kernel-firmware-20220622.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:821ecdc0f685822634c0010e1211527be5cbbcb3d4a3e8644ced558392444179
-size 244437108
diff --git a/kernel-firmware-20220714.tar.xz b/kernel-firmware-20220714.tar.xz
new file mode 100644
index 0000000..63165d2
--- /dev/null
+++ b/kernel-firmware-20220714.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fcdb296981d45098b965f0f823c736423d5d2f3547bcf360c8e2ff95bb90f833
+size 235480068
diff --git a/kernel-firmware.changes b/kernel-firmware.changes
index 94c3bd7..b96b4dd 100644
--- a/kernel-firmware.changes
+++ b/kernel-firmware.changes
@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Mon Jul 18 07:10:06 UTC 2022 - tiwai@suse.com
+
+- Update to version 20220714 (git commit 84661a3ba62f):
+ * amdgpu: update DMCUB firmware for DCN 3.1.6
+ * WHENCE: Correct dangling symlinks
+ * Correct WHENCE entry for wfx firmware
+ * bnx2: Drop unsupported Broadcom NetXtremeII firmware
+ * bnx2: drop unsupported firmwares
+ * bnx2: sort firmware names in filesystem order
+ * Remove old Broadcom Everest (bnx2x) v4/5 firmware
+ * drop Token Ring network firmwares
+ * Drop TDA7706 radio firmware
+ * Drop Intel WiMax firmware
+ * Drop Computone IntelliPort Plus serial firmware
+ * Drop ATM Ambassador devices firmware
+ * brocade: drop old unsupported firmware revs
+ * amdgpu: update yellow carp DMCUB firmware
+ * linux-firmware: update firmware for MT7622 WiFi device
+ * linux-firmware: update firmware for MT7922 WiFi device
+ * linux-firmware: update firmware for mediatek bluetooth chip (MT7922)
+ * linux-firmware: Update firmware file for Intel Bluetooth 9462
+ * linux-firmware: Update firmware file for Intel Bluetooth 9462
+ * linux-firmware: Update firmware file for Intel Bluetooth 9560
+ * linux-firmware: Update firmware file for Intel Bluetooth 9560
+ * linux-firmware: Update firmware file for Intel Bluetooth AX201
+ * linux-firmware: Update firmware file for Intel Bluetooth AX201
+ * linux-firmware: Update firmware file for Intel Bluetooth AX211
+ * linux-firmware: Update firmware file for Intel Bluetooth AX211
+ * linux-firmware: Update firmware file for Intel Bluetooth AX210
+ * linux-firmware: Update firmware file for Intel Bluetooth AX200
+ * linux-firmware: Update firmware file for Intel Bluetooth AX201
+ * mediatek: Add SCP firmware for MT8186
+ * rtw88: 8822c: Update normal firmware to v9.9.13
+ * rtw88: 8822c: Update normal firmware to v9.9.12
+- Drop obsoleted temporary patches:
+ wfx-WHENCE-fix.diff
+ brcm-symlink-fixes.diff
+- Minor update of README.build
+- Fix missing aliases for qlogic (bsc#1200889)
+
-------------------------------------------------------------------
Mon Jul 04 07:42:16 UTC 2022 - tiwai@suse.com
diff --git a/kernel-firmware.spec b/kernel-firmware.spec
index 1a8b350..c8aa716 100644
--- a/kernel-firmware.spec
+++ b/kernel-firmware.spec
@@ -23,10 +23,10 @@
%endif
%define __ksyms_path ^%{_firmwaredir}
-%define version_unconverted 20220622
+%define version_unconverted 20220714
Name: kernel-firmware
-Version: 20220622
+Version: 20220714
Release: 0
Summary: Linux kernel firmware files
License: GPL-2.0-only AND SUSE-Firmware AND GPL-2.0-or-later AND MIT
@@ -59,9 +59,6 @@ Source1011: fwtopics.py
Source1012: check-topic.py
Source1013: update-aliases.py
Source1014: README.build
-# temporary fix
-Patch1: wfx-WHENCE-fix.diff
-Patch2: brcm-symlink-fixes.diff
BuildRequires: fdupes
BuildRequires: suse-module-tools
Requires(post): /usr/bin/mkdir /usr/bin/touch
@@ -1733,18 +1730,6 @@ Supplements: modalias(pci:v00008086d00001D6Bsv*sd*bc*sc*i*)
Supplements: modalias(pci:v00008086d000024F0sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00008086d000024F1sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00008086d000037C8sv*sd*bc*sc*i*)
-Supplements: modalias(usb:v8086p0180d*dc*dsc*dp*ic*isc*ip*in*)
-Supplements: modalias(usb:v8086p0181d*dc*dsc*dp*ic*isc*ip*in*)
-Supplements: modalias(usb:v8086p0182d*dc*dsc*dp*ic*isc*ip*in*)
-Supplements: modalias(usb:v8086p0186d*dc*dsc*dp*ic*isc*ip*in*)
-Supplements: modalias(usb:v8086p0187d*dc*dsc*dp*ic*isc*ip*in*)
-Supplements: modalias(usb:v8086p0188d*dc*dsc*dp*ic*isc*ip*in*)
-Supplements: modalias(usb:v8086p1403d*dc*dsc*dp*ic*isc*ip*in*)
-Supplements: modalias(usb:v8086p1405d*dc*dsc*dp*ic*isc*ip*in*)
-Supplements: modalias(usb:v8086p1406d*dc*dsc*dp*ic*isc*ip*in*)
-Supplements: modalias(usb:v8087p07D6d*dc*dsc*dp*ic*isc*ip*in*)
-Supplements: modalias(usb:v8087p07D7d*dc*dsc*dp*ic*isc*ip*in*)
-Supplements: modalias(usb:v8087p07D9d*dc*dsc*dp*ic*isc*ip*in*)
%description intel
This package contains compressed kernel firmware files for
@@ -3130,8 +3115,6 @@ Supplements: modalias(pci:v00001077d00008440sv*sd*bc02sc00i00*)
Supplements: modalias(pci:v00001077d00008830sv*sd*bc02sc00i00*)
Supplements: modalias(pci:v00001077d00008C30sv*sd*bc02sc00i00*)
Supplements: modalias(pci:v000010A9d00000009sv*sd*bc02sc00i*)
-Supplements: modalias(pci:v000010B6d00001001sv*sd*bc*sc*i*)
-Supplements: modalias(pci:v000010B6d00001002sv*sd*bc*sc*i*)
Supplements: modalias(pci:v000010B7d00000001sv*sd*bc02sc00i*)
Supplements: modalias(pci:v000010B7d00009900sv*sd*bc*sc*i*)
Supplements: modalias(pci:v000010B7d00009902sv*sd*bc*sc*i*)
@@ -4148,6 +4131,15 @@ Supplements: modalias(pci:v00001077d00001080sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00001077d00001216sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00001077d00001240sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00001077d00001280sv*sd*bc*sc*i*)
+Supplements: modalias(pci:v00001077d00001634sv*sd*bc*sc*i*)
+Supplements: modalias(pci:v00001077d00001636sv*sd*bc*sc*i*)
+Supplements: modalias(pci:v00001077d00001644sv*sd*bc*sc*i*)
+Supplements: modalias(pci:v00001077d00001654sv*sd*bc*sc*i*)
+Supplements: modalias(pci:v00001077d00001656sv*sd*bc*sc*i*)
+Supplements: modalias(pci:v00001077d0000165Csv*sd*bc*sc*i*)
+Supplements: modalias(pci:v00001077d0000165Esv*sd*bc*sc*i*)
+Supplements: modalias(pci:v00001077d00001664sv*sd*bc*sc*i*)
+Supplements: modalias(pci:v00001077d00001666sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00001077d00002031sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00001077d00002061sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00001077d00002071sv*sd*bc*sc*i*)
@@ -4175,6 +4167,10 @@ Supplements: modalias(pci:v00001077d00008001sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00001077d00008021sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00001077d00008031sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00001077d00008044sv*sd*bc*sc*i*)
+Supplements: modalias(pci:v00001077d00008070sv*sd*bc*sc*i*)
+Supplements: modalias(pci:v00001077d00008080sv*sd*bc*sc*i*)
+Supplements: modalias(pci:v00001077d00008084sv*sd*bc*sc*i*)
+Supplements: modalias(pci:v00001077d00008090sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00001077d00008432sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00001077d0000F001sv*sd*bc*sc*i*)
Supplements: modalias(pci:v00001657d00000013sv*sd*bc*sc*i*)
@@ -6207,8 +6203,6 @@ various USB WiFi / Ethernet drivers.
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
# additional firmwares
cat %{SOURCE1} >> WHENCE
cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
diff --git a/kernel-firmware.spec.in b/kernel-firmware.spec.in
index 671ea02..cfc2b8b 100644
--- a/kernel-firmware.spec.in
+++ b/kernel-firmware.spec.in
@@ -59,9 +59,6 @@ Source1011: fwtopics.py
Source1012: check-topic.py
Source1013: update-aliases.py
Source1014: README.build
-# temporary fix
-Patch1: wfx-WHENCE-fix.diff
-Patch2: brcm-symlink-fixes.diff
BuildRequires: fdupes
BuildRequires: suse-module-tools
Requires(post): /usr/bin/mkdir /usr/bin/touch
@@ -121,8 +118,6 @@ all files that have been provided by kernel-firmware package.
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
# additional firmwares
cat %{SOURCE1} >> WHENCE
cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
diff --git a/licenses.list b/licenses.list
index 638ff8f..d1b5d91 100644
--- a/licenses.list
+++ b/licenses.list
@@ -1,12 +1,10 @@
# FIRSTWORD: TOPIC LICENSES
BCM-0bb4-0306: brcm LICENCE.cypress
-ambassador: network
snd-korg1212: sound
snd-maestro3: sound
snd-ymfpci: sound
advansys: platform
qla1280: qlogic LICENCE.qla1280
-smctr: network
kaweth: network LICENCE.kaweth
dvb-ttusb-budget: media
keyspan: serial GPL-2 GPL-3
@@ -15,7 +13,6 @@ emi26: sound
emi62: sound
ti_usb_3410_5052: serial
whiteheat: serial
-ip2: serial
cpia2: media
dabusb: media
vicam: media
@@ -36,7 +33,6 @@ e100: network LICENCE.e100
acenic: network
tg3: network
starfire: network
-i2400m-usb: intel LICENCE.i2400m
libertas: marvell LICENCE.Marvell LICENCE.OLPC
mwl8k: marvell LICENCE.Marvell
mwifiex: marvell LICENCE.Marvell
@@ -46,7 +42,6 @@ cx231xx: media
tehuti: network
typhoon: network
yam: platform
-3c359: network
pcnet_cs: platform
3c589_cs: platform
3c574_cs: platform
@@ -87,7 +82,6 @@ ueagle-atm: ueagle LICENCE.ueagle-atm4-firmware
vxge: network
brcmsmac: brcm LICENCE.broadcom_bcm43xx
brcmfmac: brcm LICENCE.broadcom_bcm43xx LICENCE.cypress GPL-2
-tda7706: media LICENCE.tda7706-firmware.txt
wl1251: ti LICENCE.wl1251
wl12xx: ti LICENCE.ti-connectivity
wl18xx: ti LICENCE.ti-connectivity
diff --git a/topics.list b/topics.list
index 3df0b27..360e70c 100644
--- a/topics.list
+++ b/topics.list
@@ -1,12 +1,10 @@
# FIRSTWORD: TOPIC MODULES...
BCM-0bb4-0306: brcm btbcm
-ambassador: network
snd-korg1212: sound
snd-maestro3: sound
snd-ymfpci: sound
advansys: platform
qla1280: qlogic
-smctr: network
kaweth: usb-network
dvb-ttusb-budget: media
keyspan: serial
@@ -15,7 +13,6 @@ emi26: sound
emi62: sound
ti_usb_3410_5052: serial
whiteheat: serial
-ip2: serial
cpia2: media
dabusb: media
vicam: media gspca_vicam vicam
@@ -36,7 +33,6 @@ e100: network
acenic: network
tg3: network
starfire: network
-i2400m-usb: intel
libertas: marvell libertas_tf_usb libertas_sdio libertas_cs usb8xxx btmrvl_sdio
mwl8k: marvell
mwifiex: mwifiex mwifiex mwifiex_pcie mwifiex_usb mwifiex_sdio btmrvl_sdio
@@ -46,7 +42,6 @@ cx231xx: media cx25840
tehuti: network
typhoon: network
yam: platform
-3c359: network
pcnet_cs: platform pcnet_cs serial_cs
3c589_cs: platform serial_cs
3c574_cs: platform serial_cs
@@ -82,12 +77,11 @@ s2255drv: platform
rtl8192e: realtek r8192e_pci
lgs8gxx: media
ib_qib: qlogic
-qed: qlogic
+qed: qlogic qede qedf qedi
ueagle-atm: ueagle
vxge: network
brcmsmac: brcm
brcmfmac: brcm
-tda7706: media
ti-vpe: media
wl1251: ti
wl12xx: ti wl12xx wl12xx_sdio wl12xx_spi
@@ -184,7 +178,6 @@ fsl-mc: dpaa2
mscc-phy: platform
meson-vdec: media
ice: network
-ast: platform
inside-secure: platform crypto_safexcel
qcom_q6v5_pas: qcom
qcom_q6v5_mss: qcom
@@ -194,3 +187,4 @@ wfx: platform
wave5: platform
rvu_cptpf: platform
amphion: platform
+ast: platform
diff --git a/wfx-WHENCE-fix.diff b/wfx-WHENCE-fix.diff
deleted file mode 100644
index 3c8211e..0000000
--- a/wfx-WHENCE-fix.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/WHENCE b/WHENCE
-index 07a68814c23b..d7ef4a4d3f7d 100644
---- a/WHENCE
-+++ b/WHENCE
-@@ -5848,9 +5848,9 @@ Driver: wfx - Silicon Labs Wi-Fi Transceiver
- File: wfx/wfm_wf200_C0.sec
- Version: 3.14
-
--File: wfx/brd4001a.pds not listed in WHENCE
--File: wfx/brd8022a.pds not listed in WHENCE
--File: wfx/brd8023a.pds not listed in WHENCE
-+File: wfx/brd4001a.pds
-+File: wfx/brd8022a.pds
-+File: wfx/brd8023a.pds
-
- Licence: Redistributable. See wfx/LICENCE.wf200 for details.
-