projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 335f7cc0 SL |
1 | From ce0ac910269d25d5dc517b457198bfebd26a94be Mon Sep 17 00:00:00 2001 |
| 2 | From: Sasha Levin <sashal@kernel.org> | |
| 3 | Date: Tue, 27 Feb 2024 11:29:14 +0100 | |
| 4 | Subject: Bluetooth: btmtk: Add MODULE_FIRMWARE() for MT7922 | |
| 5 | ||
| 6 | From: Takashi Iwai <tiwai@suse.de> | |
| 7 | ||
| 8 | [ Upstream commit 3e465a07cdf444140f16bc57025c23fcafdde997 ] | |
| 9 | ||
| 10 | Since dracut refers to the module info for defining the required | |
| 11 | firmware files and btmtk driver doesn't provide the firmware info for | |
| 12 | MT7922, the generate initrd misses the firmware, resulting in the | |
| 13 | broken Bluetooth. | |
| 14 | ||
| 15 | This patch simply adds the MODULE_FIRMWARE() for the missing entry | |
| 16 | for covering that. | |
| 17 | ||
| 18 | Link: https://bugzilla.suse.com/show_bug.cgi?id=1214133 | |
| 19 | Signed-off-by: Takashi Iwai <tiwai@suse.de> | |
| 20 | Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de> | |
| 21 | Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> | |
| 22 | Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | |
| 23 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
| 24 | --- | |
| 25 | drivers/bluetooth/btmtk.c | 1 + | |
| 26 | drivers/bluetooth/btmtk.h | 1 + | |
| 27 | 2 files changed, 2 insertions(+) | |
| 28 | ||
| 29 | diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c | |
| 30 | index 285418dbb43f5..ac8ebccd35075 100644 | |
| 31 | --- a/drivers/bluetooth/btmtk.c | |
| 32 | +++ b/drivers/bluetooth/btmtk.c | |
| 33 | @@ -422,5 +422,6 @@ MODULE_LICENSE("GPL"); | |
| 34 | MODULE_FIRMWARE(FIRMWARE_MT7622); | |
| 35 | MODULE_FIRMWARE(FIRMWARE_MT7663); | |
| 36 | MODULE_FIRMWARE(FIRMWARE_MT7668); | |
| 37 | +MODULE_FIRMWARE(FIRMWARE_MT7922); | |
| 38 | MODULE_FIRMWARE(FIRMWARE_MT7961); | |
| 39 | MODULE_FIRMWARE(FIRMWARE_MT7925); | |
| 40 | diff --git a/drivers/bluetooth/btmtk.h b/drivers/bluetooth/btmtk.h | |
| 41 | index 56f5502baadf9..cbcdb99a22e6d 100644 | |
| 42 | --- a/drivers/bluetooth/btmtk.h | |
| 43 | +++ b/drivers/bluetooth/btmtk.h | |
| 44 | @@ -4,6 +4,7 @@ | |
| 45 | #define FIRMWARE_MT7622 "mediatek/mt7622pr2h.bin" | |
| 46 | #define FIRMWARE_MT7663 "mediatek/mt7663pr2h.bin" | |
| 47 | #define FIRMWARE_MT7668 "mediatek/mt7668pr2h.bin" | |
| 48 | +#define FIRMWARE_MT7922 "mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin" | |
| 49 | #define FIRMWARE_MT7961 "mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin" | |
| 50 | #define FIRMWARE_MT7925 "mediatek/mt7925/BT_RAM_CODE_MT7925_1_1_hdr.bin" | |
| 51 | ||
| 52 | -- | |
| 53 | 2.43.0 | |
| 54 |