diff --git a/WHENCE b/WHENCE
index fb5b42ea848d93204d84da844a498ecac534150f..e8c35e9bc66ce2f6bc5e94777702aa12d9d1ed3f 100644
--- a/WHENCE
+++ b/WHENCE
@@ -2518,17 +2518,29 @@ File: amdgpu/aldebaran_smc.bin
 File: amdgpu/aldebaran_sos.bin
 File: amdgpu/aldebaran_ta.bin
 File: amdgpu/aldebaran_vcn.bin
+File: amdgpu/gc_10_3_6_ce.bin
+File: amdgpu/gc_10_3_6_me.bin
+File: amdgpu/gc_10_3_6_mec.bin
+File: amdgpu/gc_10_3_6_mec2.bin
+File: amdgpu/gc_10_3_6_pfp.bin
+File: amdgpu/gc_10_3_6_rlc.bin
 File: amdgpu/gc_10_3_7_ce.bin
 File: amdgpu/gc_10_3_7_me.bin
 File: amdgpu/gc_10_3_7_mec.bin
 File: amdgpu/gc_10_3_7_mec2.bin
 File: amdgpu/gc_10_3_7_pfp.bin
 File: amdgpu/gc_10_3_7_rlc.bin
+File: amdgpu/dcn_3_1_5_dmcub.bin
 File: amdgpu/dcn_3_1_6_dmcub.bin
+File: amdgpu/psp_13_0_5_asd.bin
+File: amdgpu/psp_13_0_5_ta.bin
+File: amdgpu/psp_13_0_5_toc.bin
 File: amdgpu/psp_13_0_8_asd.bin
 File: amdgpu/psp_13_0_8_ta.bin
 File: amdgpu/psp_13_0_8_toc.bin
+File: amdgpu/sdma_5_2_6.bin
 File: amdgpu/sdma_5_2_7.bin
+File: amdgpu/vcn_3_1_2.bin
 
 Licence: Redistributable. See LICENSE.amdgpu for details.
 
@@ -5900,7 +5912,7 @@ File: qcom/a660_gmu.bin
 File: qcom/a660_sqe.fw
 File: qcom/leia_pfp_470.fw
 File: qcom/leia_pm4_470.fw
-File: qcom/LENOVO/21BX/qcdxkmsuc8280.mbn
+File: qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn
 
 Licence: Redistributable. See LICENSE.qcom and qcom/NOTICE.txt for details
 
@@ -5927,13 +5939,14 @@ File: qcom/sm8250/adspr.jsn
 File: qcom/sm8250/adspua.jsn
 File: qcom/sm8250/cdsp.mbn
 File: qcom/sm8250/cdspr.jsn
-File: qcom/LENOVO/21BX/adspr.jsn
-File: qcom/LENOVO/21BX/adspua.jsn
-File: qcom/LENOVO/21BX/battmgr.jsn
-File: qcom/LENOVO/21BX/cdspr.jsn
-File: qcom/LENOVO/21BX/qcadsp8280.mbn
-File: qcom/LENOVO/21BX/qccdsp8280.mbn
-File: qcom/LENOVO/21BX/qcslpi8280.mbn
+File: qcom/sc8280xp/LENOVO/21BX/adspr.jsn
+File: qcom/sc8280xp/LENOVO/21BX/adspua.jsn
+File: qcom/sc8280xp/LENOVO/21BX/battmgr.jsn
+File: qcom/sc8280xp/LENOVO/21BX/cdspr.jsn
+File: qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn
+File: qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn
+File: qcom/sc8280xp/LENOVO/21BX/qcslpi8280.mbn
+Link: qcom/LENOVO/21BX -> ../sc8280xp/LENOVO/21BX
 
 Licence: Redistributable. See LICENSE.qcom and qcom/NOTICE.txt for details
 
diff --git a/amdgpu/dcn_3_1_5_dmcub.bin b/amdgpu/dcn_3_1_5_dmcub.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a714d3ca1320a1e31b443595916fa18190791ab1
Binary files /dev/null and b/amdgpu/dcn_3_1_5_dmcub.bin differ
diff --git a/amdgpu/gc_10_3_6_ce.bin b/amdgpu/gc_10_3_6_ce.bin
new file mode 100644
index 0000000000000000000000000000000000000000..da7bf47e4c752e23fa8aae09e22e401ea0b531d7
Binary files /dev/null and b/amdgpu/gc_10_3_6_ce.bin differ
diff --git a/amdgpu/gc_10_3_6_me.bin b/amdgpu/gc_10_3_6_me.bin
new file mode 100644
index 0000000000000000000000000000000000000000..23374e973051af2c4a9e811e00087bbb58c46050
Binary files /dev/null and b/amdgpu/gc_10_3_6_me.bin differ
diff --git a/amdgpu/gc_10_3_6_mec.bin b/amdgpu/gc_10_3_6_mec.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f8cd832398d4200e6822b5bc6758ccb45cdb2605
Binary files /dev/null and b/amdgpu/gc_10_3_6_mec.bin differ
diff --git a/amdgpu/gc_10_3_6_mec2.bin b/amdgpu/gc_10_3_6_mec2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f8cd832398d4200e6822b5bc6758ccb45cdb2605
Binary files /dev/null and b/amdgpu/gc_10_3_6_mec2.bin differ
diff --git a/amdgpu/gc_10_3_6_pfp.bin b/amdgpu/gc_10_3_6_pfp.bin
new file mode 100644
index 0000000000000000000000000000000000000000..88887f195dc6649bc68d77ccf9556103e136bf7b
Binary files /dev/null and b/amdgpu/gc_10_3_6_pfp.bin differ
diff --git a/amdgpu/gc_10_3_6_rlc.bin b/amdgpu/gc_10_3_6_rlc.bin
new file mode 100644
index 0000000000000000000000000000000000000000..43cc75b74513bc4f9437e24be8bfc3029fe7e380
Binary files /dev/null and b/amdgpu/gc_10_3_6_rlc.bin differ
diff --git a/amdgpu/psp_13_0_5_asd.bin b/amdgpu/psp_13_0_5_asd.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2f8bd03a65ad0f62cd7c5558f6a724100ae2e937
Binary files /dev/null and b/amdgpu/psp_13_0_5_asd.bin differ
diff --git a/amdgpu/psp_13_0_5_ta.bin b/amdgpu/psp_13_0_5_ta.bin
new file mode 100644
index 0000000000000000000000000000000000000000..bccd8908102014ff58936eaae946bbaa2f4b629f
Binary files /dev/null and b/amdgpu/psp_13_0_5_ta.bin differ
diff --git a/amdgpu/psp_13_0_5_toc.bin b/amdgpu/psp_13_0_5_toc.bin
new file mode 100644
index 0000000000000000000000000000000000000000..bf93a1ac1c5cc1f3c1353f5b90ac9755c479998f
Binary files /dev/null and b/amdgpu/psp_13_0_5_toc.bin differ
diff --git a/amdgpu/sdma_5_2_6.bin b/amdgpu/sdma_5_2_6.bin
new file mode 100644
index 0000000000000000000000000000000000000000..876cd90f93e901507040cf483e4a6bdbc43893b8
Binary files /dev/null and b/amdgpu/sdma_5_2_6.bin differ
diff --git a/amdgpu/vcn_3_1_2.bin b/amdgpu/vcn_3_1_2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a523f971d772cd73ce8a35231d5fd6738c3946a9
Binary files /dev/null and b/amdgpu/vcn_3_1_2.bin differ
diff --git a/amdgpu/yellow_carp_dmcub.bin b/amdgpu/yellow_carp_dmcub.bin
index f4c290894834e453f5f4aa54f6c43aae8b325d5f..73613bbbd076966fcd1e4655b2e7de96e44cb047 100644
Binary files a/amdgpu/yellow_carp_dmcub.bin and b/amdgpu/yellow_carp_dmcub.bin differ
diff --git a/qcom/LENOVO/21BX/adspr.jsn b/qcom/sc8280xp/LENOVO/21BX/adspr.jsn
similarity index 100%
rename from qcom/LENOVO/21BX/adspr.jsn
rename to qcom/sc8280xp/LENOVO/21BX/adspr.jsn
diff --git a/qcom/LENOVO/21BX/adspua.jsn b/qcom/sc8280xp/LENOVO/21BX/adspua.jsn
similarity index 100%
rename from qcom/LENOVO/21BX/adspua.jsn
rename to qcom/sc8280xp/LENOVO/21BX/adspua.jsn
diff --git a/qcom/LENOVO/21BX/battmgr.jsn b/qcom/sc8280xp/LENOVO/21BX/battmgr.jsn
similarity index 100%
rename from qcom/LENOVO/21BX/battmgr.jsn
rename to qcom/sc8280xp/LENOVO/21BX/battmgr.jsn
diff --git a/qcom/LENOVO/21BX/cdspr.jsn b/qcom/sc8280xp/LENOVO/21BX/cdspr.jsn
similarity index 100%
rename from qcom/LENOVO/21BX/cdspr.jsn
rename to qcom/sc8280xp/LENOVO/21BX/cdspr.jsn
diff --git a/qcom/LENOVO/21BX/qcadsp8280.mbn b/qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn
similarity index 100%
rename from qcom/LENOVO/21BX/qcadsp8280.mbn
rename to qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn
diff --git a/qcom/LENOVO/21BX/qccdsp8280.mbn b/qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn
similarity index 100%
rename from qcom/LENOVO/21BX/qccdsp8280.mbn
rename to qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn
diff --git a/qcom/LENOVO/21BX/qcdxkmsuc8280.mbn b/qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn
similarity index 100%
rename from qcom/LENOVO/21BX/qcdxkmsuc8280.mbn
rename to qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn
diff --git a/qcom/LENOVO/21BX/qcslpi8280.mbn b/qcom/sc8280xp/LENOVO/21BX/qcslpi8280.mbn
similarity index 100%
rename from qcom/LENOVO/21BX/qcslpi8280.mbn
rename to qcom/sc8280xp/LENOVO/21BX/qcslpi8280.mbn
diff --git a/rtw89/rtw8852c_fw.bin b/rtw89/rtw8852c_fw.bin
index 86b634aeb69f45d69a8b4737125e92d5a01a4c8f..1c4dda07040aefa87a8027b4ad6312886548bfc0 100644
Binary files a/rtw89/rtw8852c_fw.bin and b/rtw89/rtw8852c_fw.bin differ