Revert "Bluetooth: btusb: Add workaround for Broadcom devices without product id" (2d13e347) · Commits · 戴 / test

Commit ("Bluetooth: btusb: Add workaround for Broadcom devices without product id") was added to deal with the BT part of the BCM4356A2 on GPD pocket laptops having an usb vid:pid of 0000:0000. After another commit to add support for the BCM UART connected BT ACPI-id BCM2E7E used on the GPD win, it turns out that the BT on the GPD pocket is connected via both USB and UART. Adding support for the BCM2E7E ACPI-id causes it to switch to UART mode. The Windows shipped with the device is using it in UART mode and the presence of the BCM2E7E ACPI-id combined with the all 0 USB vid:pid indicates that the BT part was never meant to be used in USB mode. With the recent patches to use serdev device enumeration / instantiation for UART attached ACPI enumerated BT devices, everything work OOTB in UART mode and the workaround for the all 0 USB vid:pid is no longer needed. This reverts commit ("Bluetooth: btusb: Add workaround for Broadcom devices without product id"). Signed-off-by:

Hans de Goede <hdegoede@redhat.com> Signed-off-by:

Marcel Holtmann <marcel@holtmann.org>

drivers/bluetooth/btusb.c

+0 −18

Original line number	Diff line number	Diff line
		@@ -66,7 +66,6 @@ static struct usb_driver btusb_driver;
		#define BTUSB_BCM2045 0x40000
		#define BTUSB_IFNUM_2 0x80000
		#define BTUSB_CW6622 0x100000
		#define BTUSB_BCM_NO_PRODID 0x200000

		static const struct usb_device_id btusb_table[] = {
		/* Generic Bluetooth USB device */
		@@ -171,10 +170,6 @@ static const struct usb_device_id btusb_table[] = {
		{ USB_VENDOR_AND_INTERFACE_INFO(0x0930, 0xff, 0x01, 0x01),
		.driver_info = BTUSB_BCM_PATCHRAM },

		/* Broadcom devices with missing product id */
		{ USB_DEVICE_AND_INTERFACE_INFO(0x0000, 0x0000, 0xff, 0x01, 0x01),
		.driver_info = BTUSB_BCM_PATCHRAM \| BTUSB_BCM_NO_PRODID },

		/* Intel Bluetooth USB Bootloader (RAM module) */
		{ USB_DEVICE(0x8087, 0x0a5a),
		.driver_info = BTUSB_INTEL_BOOT \| BTUSB_BROKEN_ISOC },
		@@ -2909,19 +2904,6 @@ static int btusb_probe(struct usb_interface *intf,
		if (id->driver_info == BTUSB_IGNORE)
		return -ENODEV;

		if (id->driver_info & BTUSB_BCM_NO_PRODID) {
		struct usb_device *udev = interface_to_usbdev(intf);

		/* For the broken Broadcom devices that show 0000:0000
		* as USB vendor and product information, check that the
		* manufacturer string identifies them as Broadcom based
		* devices.
		*/
		if (!udev->manufacturer \|\|
		strcmp(udev->manufacturer, "Broadcom Corp"))
		return -ENODEV;
		}

		if (id->driver_info & BTUSB_ATH3012) {
		struct usb_device *udev = interface_to_usbdev(intf);

Admin message