| Message ID | 20240227102914.8341-1-tiwai@suse.de |
|---|---|
| State | Accepted |
| Commit | aa1767a3fcd75231e11822b0f95f017fc521691c |
| Headers | show |
| Series | Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922 | expand |
On 27/02/2024 11:29, Takashi Iwai wrote: > Since dracut refers to the module info for defining the required > firmware files and btmtk driver doesn't provide the firmware info for > MT7922, the generate initrd misses the firmware, resulting in the > broken Bluetooth. > > This patch simply adds the MODULE_FIRMWARE() for the missing entry > for covering that. > > Link: https://bugzilla.suse.com/show_bug.cgi?id=1214133 > Signed-off-by: Takashi Iwai <tiwai@suse.de> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> > --- > drivers/bluetooth/btmtk.c | 1 + > drivers/bluetooth/btmtk.h | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c > index aaabb732082c..e5138a207f37 100644 > --- a/drivers/bluetooth/btmtk.c > +++ b/drivers/bluetooth/btmtk.c > @@ -420,5 +420,6 @@ MODULE_LICENSE("GPL"); > MODULE_FIRMWARE(FIRMWARE_MT7622); > MODULE_FIRMWARE(FIRMWARE_MT7663); > MODULE_FIRMWARE(FIRMWARE_MT7668); > +MODULE_FIRMWARE(FIRMWARE_MT7922); > MODULE_FIRMWARE(FIRMWARE_MT7961); > MODULE_FIRMWARE(FIRMWARE_MT7925); > diff --git a/drivers/bluetooth/btmtk.h b/drivers/bluetooth/btmtk.h > index 56f5502baadf..cbcdb99a22e6 100644 > --- a/drivers/bluetooth/btmtk.h > +++ b/drivers/bluetooth/btmtk.h > @@ -4,6 +4,7 @@ > #define FIRMWARE_MT7622 "mediatek/mt7622pr2h.bin" > #define FIRMWARE_MT7663 "mediatek/mt7663pr2h.bin" > #define FIRMWARE_MT7668 "mediatek/mt7668pr2h.bin" > +#define FIRMWARE_MT7922 "mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin" > #define FIRMWARE_MT7961 "mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin" > #define FIRMWARE_MT7925 "mediatek/mt7925/BT_RAM_CODE_MT7925_1_1_hdr.bin" >
Hello: This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: On Tue, 27 Feb 2024 11:29:14 +0100 you wrote: > Since dracut refers to the module info for defining the required > firmware files and btmtk driver doesn't provide the firmware info for > MT7922, the generate initrd misses the firmware, resulting in the > broken Bluetooth. > > This patch simply adds the MODULE_FIRMWARE() for the missing entry > for covering that. > > [...] Here is the summary with links: - Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922 https://git.kernel.org/bluetooth/bluetooth-next/c/aa1767a3fcd7 You are awesome, thank you!
diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c index aaabb732082c..e5138a207f37 100644 --- a/drivers/bluetooth/btmtk.c +++ b/drivers/bluetooth/btmtk.c @@ -420,5 +420,6 @@ MODULE_LICENSE("GPL"); MODULE_FIRMWARE(FIRMWARE_MT7622); MODULE_FIRMWARE(FIRMWARE_MT7663); MODULE_FIRMWARE(FIRMWARE_MT7668); +MODULE_FIRMWARE(FIRMWARE_MT7922); MODULE_FIRMWARE(FIRMWARE_MT7961); MODULE_FIRMWARE(FIRMWARE_MT7925); diff --git a/drivers/bluetooth/btmtk.h b/drivers/bluetooth/btmtk.h index 56f5502baadf..cbcdb99a22e6 100644 --- a/drivers/bluetooth/btmtk.h +++ b/drivers/bluetooth/btmtk.h @@ -4,6 +4,7 @@ #define FIRMWARE_MT7622 "mediatek/mt7622pr2h.bin" #define FIRMWARE_MT7663 "mediatek/mt7663pr2h.bin" #define FIRMWARE_MT7668 "mediatek/mt7668pr2h.bin" +#define FIRMWARE_MT7922 "mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin" #define FIRMWARE_MT7961 "mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin" #define FIRMWARE_MT7925 "mediatek/mt7925/BT_RAM_CODE_MT7925_1_1_hdr.bin"
Since dracut refers to the module info for defining the required firmware files and btmtk driver doesn't provide the firmware info for MT7922, the generate initrd misses the firmware, resulting in the broken Bluetooth. This patch simply adds the MODULE_FIRMWARE() for the missing entry for covering that. Link: https://bugzilla.suse.com/show_bug.cgi?id=1214133 Signed-off-by: Takashi Iwai <tiwai@suse.de> --- drivers/bluetooth/btmtk.c | 1 + drivers/bluetooth/btmtk.h | 1 + 2 files changed, 2 insertions(+)