| Message ID | 20230315031647.26467-2-jianhui.lee@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | Bluetooth: btusb: Add module firmware information for MT7622 and MT7961 | expand |
On Wed, Mar 15, 2023 at 11:18 AM Jian Hui Lee <jianhui.lee@canonical.com> wrote: > > BugLink: https://bugs.launchpad.net/bugs/2011520 > > Export the required module firmware information of MT7622 and M7961 used by > modinfo. > > Signed-off-by: Jian Hui Lee <jianhui.lee@canonical.com> > --- > drivers/bluetooth/btusb.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index c8d31d795530..3e53fd379265 100644 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@ -2178,8 +2178,10 @@ static int btusb_send_frame_intel(struct hci_dev *hdev, struct sk_buff *skb) > #define MTK_BT_RST_DONE 0x00000100 > #define MTK_BT_RESET_WAIT_MS 100 > #define MTK_BT_RESET_NUM_TRIES 10 > +#define FIRMWARE_MT7622 "mediatek/mt7622pr2h.bin" > #define FIRMWARE_MT7663 "mediatek/mt7663pr2h.bin" > #define FIRMWARE_MT7668 "mediatek/mt7668pr2h.bin" > +#define FIRMWARE_MT7961 "mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin" > > #define HCI_WMT_MAX_EVENT_SIZE 64 > /* It is for mt79xx download rom patch*/ > @@ -3119,8 +3121,10 @@ static int btusb_recv_acl_mtk(struct hci_dev *hdev, struct sk_buff *skb) > return hci_recv_frame(hdev, skb); > } > > +MODULE_FIRMWARE(FIRMWARE_MT7622); > MODULE_FIRMWARE(FIRMWARE_MT7663); > MODULE_FIRMWARE(FIRMWARE_MT7668); > +MODULE_FIRMWARE(FIRMWARE_MT7961); This change seems to be very upstream-able. Is there any plan to do that? Kai-Heng > > #ifdef CONFIG_PM > /* Configure an out-of-band gpio as wake-up pin, if specified in device tree */ > -- > 2.34.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index c8d31d795530..3e53fd379265 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2178,8 +2178,10 @@ static int btusb_send_frame_intel(struct hci_dev *hdev, struct sk_buff *skb) #define MTK_BT_RST_DONE 0x00000100 #define MTK_BT_RESET_WAIT_MS 100 #define MTK_BT_RESET_NUM_TRIES 10 +#define FIRMWARE_MT7622 "mediatek/mt7622pr2h.bin" #define FIRMWARE_MT7663 "mediatek/mt7663pr2h.bin" #define FIRMWARE_MT7668 "mediatek/mt7668pr2h.bin" +#define FIRMWARE_MT7961 "mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin" #define HCI_WMT_MAX_EVENT_SIZE 64 /* It is for mt79xx download rom patch*/ @@ -3119,8 +3121,10 @@ static int btusb_recv_acl_mtk(struct hci_dev *hdev, struct sk_buff *skb) return hci_recv_frame(hdev, skb); } +MODULE_FIRMWARE(FIRMWARE_MT7622); MODULE_FIRMWARE(FIRMWARE_MT7663); MODULE_FIRMWARE(FIRMWARE_MT7668); +MODULE_FIRMWARE(FIRMWARE_MT7961); #ifdef CONFIG_PM /* Configure an out-of-band gpio as wake-up pin, if specified in device tree */
BugLink: https://bugs.launchpad.net/bugs/2011520 Export the required module firmware information of MT7622 and M7961 used by modinfo. Signed-off-by: Jian Hui Lee <jianhui.lee@canonical.com> --- drivers/bluetooth/btusb.c | 4 ++++ 1 file changed, 4 insertions(+)