Merge branch 'main' into 'main'HEADmain

Bluetooth: Add symbolic links for Intel AX201 firmware variants

See merge request kernel-firmware/linux-firmware!905

39 files changed, 41 insertions, 63 deletions

diff --git a/WHENCE b/WHENCE
index 680ff8e5..a2a88067 100644
--- a/WHENCE
+++ b/WHENCE
@@ -4190,31 +4190,27 @@ Version: BT_WindStormPeak_REL1299
 
 File: intel/ibt-17-16-1.sfi
 File: intel/ibt-17-16-1.ddc
-File: intel/ibt-17-2.sfi
-File: intel/ibt-17-2.ddc
+Link: intel/ibt-17-2.sfi -> ibt-17-16-1.sfi
+Link: intel/ibt-17-2.ddc -> ibt-17-16-1.ddc
+
 File: intel/ibt-18-16-1.sfi
 File: intel/ibt-18-16-1.ddc
-File: intel/ibt-18-2.sfi
-File: intel/ibt-18-2.ddc
+Link: intel/ibt-18-2.sfi -> ibt-18-16-1.sfi
+Link: intel/ibt-18-2.ddc -> ibt-18-16-1.ddc
 Version: BT_Pulsar_REL20425_22.20.2412.20425
 
 File: intel/ibt-17-0-1.sfi
-Version: BT_JeffersonPeak_A0_B0_REL0201
 File: intel/ibt-17-0-1.ddc
-Version: BT_JeffersonPeak_A0_B0_REL0201
-File: intel/ibt-17-1.sfi
-Version: BT_JeffersonPeak_A0_B0_REL0201
-File: intel/ibt-17-1.ddc
+Link: intel/ibt-17-1.sfi -> ibt-17-0-1.sfi
+Link: intel/ibt-17-1.ddc -> ibt-17-0-1.ddc
 Version: BT_JeffersonPeak_A0_B0_REL0201
 
 File: intel/ibt-18-0-1.sfi
-Version: BT_ThunderPeak_A0_B0_REL0201
 File: intel/ibt-18-0-1.ddc
+Link: intel/ibt-18-1.sfi -> ibt-18-0-1.sfi
+Link: intel/ibt-18-1.ddc -> ibt-18-0-1.ddc
 Version: BT_ThunderPeak_A0_B0_REL0201
-File: intel/ibt-18-1.sfi
-Version: BT_ThunderPeak_A0_B0_REL0201
-File: intel/ibt-18-1.ddc
-Version: BT_ThunderPeak_A0_B0_REL0201
+
 File: intel/ibt-20-0-3.sfi
 Version: BT_CyclonePeak_A0_REL53636
 File: intel/ibt-20-0-3.ddc
@@ -4227,71 +4223,53 @@ File: intel/ibt-20-1-4.sfi
 Version: BT_CyclonePeak_A0_REL53636
 File: intel/ibt-20-1-4.ddc
 Version: BT_CyclonePeak_A0_REL53636
-File: intel/ibt-19-0-0.sfi
-Version: BT_Quasar_REL53697
-File: intel/ibt-19-0-0.ddc
-Version: BT_Quasar_REL53697
-File: intel/ibt-19-0-1.sfi
-Version: BT_Quasar_REL53697
-File: intel/ibt-19-0-1.ddc
-Version: BT_Quasar_REL53697
-File: intel/ibt-19-0-3.sfi
-Version: BT_Quasar_REL53697
-File: intel/ibt-19-0-3.ddc
-Version: BT_Quasar_REL53697
+
 File: intel/ibt-19-0-4.sfi
-Version: BT_HarrisonPeak_REL53697
 File: intel/ibt-19-0-4.ddc
-Version: BT_HarrisonPeak_REL53697
-File: intel/ibt-19-16-4.sfi
-Version: BT_HarrisonPeak_REL53697
-File: intel/ibt-19-16-4.ddc
-Version: BT_HarrisonPeak_REL53697
-File: intel/ibt-19-32-1.sfi
-Version: BT_HarrisonPeak_REL53697
-File: intel/ibt-19-32-1.ddc
-Version: BT_HarrisonPeak_REL53697
-File: intel/ibt-19-32-0.sfi
-Version: BT_HarrisonPeak_REL53697
-File: intel/ibt-19-32-0.ddc
-Version: BT_HarrisonPeak_REL53697
-File: intel/ibt-19-32-4.sfi
-Version: BT_HarrisonPeak_REL53697
-File: intel/ibt-19-32-4.ddc
-Version: BT_HarrisonPeak_REL53697
-File: intel/ibt-19-240-1.sfi
-Version: BT_HarrisonPeak_REL53697
-File: intel/ibt-19-240-1.ddc
-Version: BT_HarrisonPeak_REL53697
-File: intel/ibt-19-240-4.sfi
-Version: BT_HarrisonPeak_REL53697
-File: intel/ibt-19-240-4.ddc
+Link: intel/ibt-19-0-0.sfi -> ibt-19-0-4.sfi
+Link: intel/ibt-19-0-0.ddc -> ibt-19-0-4.ddc
+Link: intel/ibt-19-0-1.sfi -> ibt-19-0-4.sfi
+Link: intel/ibt-19-0-1.ddc -> ibt-19-0-4.ddc
+Link: intel/ibt-19-0-3.sfi -> ibt-19-0-4.sfi
+Link: intel/ibt-19-0-3.ddc -> ibt-19-0-4.ddc
+Link: intel/ibt-19-16-4.sfi -> ibt-19-0-4.sfi
+Link: intel/ibt-19-16-4.ddc -> ibt-19-0-4.ddc
+Link: intel/ibt-19-32-1.sfi -> ibt-19-0-4.sfi
+Link: intel/ibt-19-32-1.ddc -> ibt-19-0-4.ddc
+Link: intel/ibt-19-32-0.sfi -> ibt-19-0-4.sfi
+Link: intel/ibt-19-32-0.ddc -> ibt-19-0-4.ddc
+Link: intel/ibt-19-32-4.sfi -> ibt-19-0-4.sfi
+Link: intel/ibt-19-32-4.ddc -> ibt-19-0-4.ddc
+Link: intel/ibt-19-240-1.sfi -> ibt-19-0-4.sfi
+Link: intel/ibt-19-240-1.ddc -> ibt-19-0-4.ddc
+Link: intel/ibt-19-240-4.sfi -> ibt-19-0-4.sfi
+Link: intel/ibt-19-240-4.ddc -> ibt-19-0-4.ddc
 Version: BT_HarrisonPeak_REL53697
 
 File: intel/ibt-0041-0041.sfi
 File: intel/ibt-0041-0041.ddc
 File: intel/ibt-0040-0041.sfi
 File: intel/ibt-0040-0041.ddc
-File: intel/ibt-0040-4150.sfi
-File: intel/ibt-0040-4150.ddc
+Link: intel/ibt-0040-4150.sfi -> ibt-0040-0041.sfi
+Link: intel/ibt-0040-4150.ddc -> ibt-0040-0041.ddc
 File: intel/ibt-1040-0041.sfi
 File: intel/ibt-1040-0041.ddc
-File: intel/ibt-1040-4150.sfi
-File: intel/ibt-1040-4150.ddc
-File: intel/ibt-0040-1050.sfi
-File: intel/ibt-0040-1050.ddc
-File: intel/ibt-1040-1050.sfi
-File: intel/ibt-1040-1050.ddc
+Link: intel/ibt-1040-4150.sfi -> ibt-1040-0041.sfi
+Link: intel/ibt-1040-4150.ddc -> ibt-1040-0041.ddc
+Link: intel/ibt-0040-1050.sfi -> ibt-0040-0041.sfi
+Link: intel/ibt-0040-1050.ddc -> ibt-0040-0041.ddc
+Link: intel/ibt-1040-1050.sfi -> ibt-1040-0041.sfi
+Link: intel/ibt-1040-1050.ddc -> ibt-1040-0041.ddc
 Version: BT_Solar_REL82122_23.50.26053.82122
 
 File: intel/ibt-0040-1020.sfi
 File: intel/ibt-0040-1020.ddc
 File: intel/ibt-1040-1020.sfi
 File: intel/ibt-1040-1020.ddc
-File: intel/ibt-0040-2120.sfi
-File: intel/ibt-0040-2120.ddc
-File: intel/ibt-1040-2120.sfi
-File: intel/ibt-1040-2120.ddc
+Link: intel/ibt-0040-2120.sfi -> ibt-0040-1020.sfi
+Link: intel/ibt-0040-2120.ddc -> ibt-0040-1020.ddc
+Link: intel/ibt-1040-2120.sfi -> ibt-1040-1020.sfi
+Link: intel/ibt-1040-2120.ddc -> ibt-1040-1020.ddc
 Version: BT_SolarJfp_REL151_22.180.2405.151
 
 File: intel/ibt-0093-0041.sfi
diff --git a/intel/ibt-0040-1050.ddc b/intel/ibt-0040-1050.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-0040-1050.ddc
+++ /dev/null
diff --git a/intel/ibt-0040-1050.sfi b/intel/ibt-0040-1050.sfi
deleted file mode 100644
index 6de49e17..00000000
--- a/intel/ibt-0040-1050.sfi
+++ /dev/null
diff --git a/intel/ibt-0040-2120.ddc b/intel/ibt-0040-2120.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-0040-2120.ddc
+++ /dev/null
diff --git a/intel/ibt-0040-2120.sfi b/intel/ibt-0040-2120.sfi
deleted file mode 100644
index 107147be..00000000
--- a/intel/ibt-0040-2120.sfi
+++ /dev/null
diff --git a/intel/ibt-0040-4150.ddc b/intel/ibt-0040-4150.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-0040-4150.ddc
+++ /dev/null
diff --git a/intel/ibt-0040-4150.sfi b/intel/ibt-0040-4150.sfi
deleted file mode 100644
index 6de49e17..00000000
--- a/intel/ibt-0040-4150.sfi
+++ /dev/null
diff --git a/intel/ibt-1040-1050.ddc b/intel/ibt-1040-1050.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-1040-1050.ddc
+++ /dev/null
diff --git a/intel/ibt-1040-1050.sfi b/intel/ibt-1040-1050.sfi
deleted file mode 100644
index 6de49e17..00000000
--- a/intel/ibt-1040-1050.sfi
+++ /dev/null
diff --git a/intel/ibt-1040-2120.ddc b/intel/ibt-1040-2120.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-1040-2120.ddc
+++ /dev/null
diff --git a/intel/ibt-1040-2120.sfi b/intel/ibt-1040-2120.sfi
deleted file mode 100644
index 107147be..00000000
--- a/intel/ibt-1040-2120.sfi
+++ /dev/null
diff --git a/intel/ibt-1040-4150.ddc b/intel/ibt-1040-4150.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-1040-4150.ddc
+++ /dev/null
diff --git a/intel/ibt-1040-4150.sfi b/intel/ibt-1040-4150.sfi
deleted file mode 100644
index 6de49e17..00000000
--- a/intel/ibt-1040-4150.sfi
+++ /dev/null
diff --git a/intel/ibt-17-1.ddc b/intel/ibt-17-1.ddc
deleted file mode 100644
index f24bb176..00000000
--- a/intel/ibt-17-1.ddc
+++ /dev/null
diff --git a/intel/ibt-17-1.sfi b/intel/ibt-17-1.sfi
deleted file mode 100644
index b95ce138..00000000
--- a/intel/ibt-17-1.sfi
+++ /dev/null
diff --git a/intel/ibt-17-2.ddc b/intel/ibt-17-2.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-17-2.ddc
+++ /dev/null
diff --git a/intel/ibt-17-2.sfi b/intel/ibt-17-2.sfi
deleted file mode 100644
index 56ffa13b..00000000
--- a/intel/ibt-17-2.sfi
+++ /dev/null
diff --git a/intel/ibt-18-1.ddc b/intel/ibt-18-1.ddc
deleted file mode 100644
index f24bb176..00000000
--- a/intel/ibt-18-1.ddc
+++ /dev/null
diff --git a/intel/ibt-18-1.sfi b/intel/ibt-18-1.sfi
deleted file mode 100644
index b95ce138..00000000
--- a/intel/ibt-18-1.sfi
+++ /dev/null
diff --git a/intel/ibt-18-2.ddc b/intel/ibt-18-2.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-18-2.ddc
+++ /dev/null
diff --git a/intel/ibt-18-2.sfi b/intel/ibt-18-2.sfi
deleted file mode 100644
index 56ffa13b..00000000
--- a/intel/ibt-18-2.sfi
+++ /dev/null
diff --git a/intel/ibt-19-0-0.ddc b/intel/ibt-19-0-0.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-19-0-0.ddc
+++ /dev/null
diff --git a/intel/ibt-19-0-0.sfi b/intel/ibt-19-0-0.sfi
deleted file mode 100644
index c936a40e..00000000
--- a/intel/ibt-19-0-0.sfi
+++ /dev/null
diff --git a/intel/ibt-19-0-1.ddc b/intel/ibt-19-0-1.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-19-0-1.ddc
+++ /dev/null
diff --git a/intel/ibt-19-0-1.sfi b/intel/ibt-19-0-1.sfi
deleted file mode 100644
index c936a40e..00000000
--- a/intel/ibt-19-0-1.sfi
+++ /dev/null
diff --git a/intel/ibt-19-0-3.ddc b/intel/ibt-19-0-3.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-19-0-3.ddc
+++ /dev/null
diff --git a/intel/ibt-19-0-3.sfi b/intel/ibt-19-0-3.sfi
deleted file mode 100644
index c936a40e..00000000
--- a/intel/ibt-19-0-3.sfi
+++ /dev/null
diff --git a/intel/ibt-19-16-4.ddc b/intel/ibt-19-16-4.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-19-16-4.ddc
+++ /dev/null
diff --git a/intel/ibt-19-16-4.sfi b/intel/ibt-19-16-4.sfi
deleted file mode 100644
index c936a40e..00000000
--- a/intel/ibt-19-16-4.sfi
+++ /dev/null
diff --git a/intel/ibt-19-240-1.ddc b/intel/ibt-19-240-1.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-19-240-1.ddc
+++ /dev/null
diff --git a/intel/ibt-19-240-1.sfi b/intel/ibt-19-240-1.sfi
deleted file mode 100644
index c936a40e..00000000
--- a/intel/ibt-19-240-1.sfi
+++ /dev/null
diff --git a/intel/ibt-19-240-4.ddc b/intel/ibt-19-240-4.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-19-240-4.ddc
+++ /dev/null
diff --git a/intel/ibt-19-240-4.sfi b/intel/ibt-19-240-4.sfi
deleted file mode 100644
index c936a40e..00000000
--- a/intel/ibt-19-240-4.sfi
+++ /dev/null
diff --git a/intel/ibt-19-32-0.ddc b/intel/ibt-19-32-0.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-19-32-0.ddc
+++ /dev/null
diff --git a/intel/ibt-19-32-0.sfi b/intel/ibt-19-32-0.sfi
deleted file mode 100644
index c936a40e..00000000
--- a/intel/ibt-19-32-0.sfi
+++ /dev/null
diff --git a/intel/ibt-19-32-1.ddc b/intel/ibt-19-32-1.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-19-32-1.ddc
+++ /dev/null
diff --git a/intel/ibt-19-32-1.sfi b/intel/ibt-19-32-1.sfi
deleted file mode 100644
index c936a40e..00000000
--- a/intel/ibt-19-32-1.sfi
+++ /dev/null
diff --git a/intel/ibt-19-32-4.ddc b/intel/ibt-19-32-4.ddc
deleted file mode 100644
index 6e067796..00000000
--- a/intel/ibt-19-32-4.ddc
+++ /dev/null
diff --git a/intel/ibt-19-32-4.sfi b/intel/ibt-19-32-4.sfi
deleted file mode 100644
index c936a40e..00000000
--- a/intel/ibt-19-32-4.sfi
+++ /dev/null