Revert "USB: pci-quirks: Add Raspberry Pi 4 quirk"

This reverts commit c65822fef4adc0ba40c37a47337376ce75f7a7bc.

The initialization of Raspberry Pi 4's USB chip is now handled through a
reset controller. No need to directly call the firmware routine through a
PCI quirk.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200629161845.6021-7-nsaenzjulienne@suse.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index fbd785dd0513bea0eba6f7af4f585c7b0becb95d..4843e94713a4defd3bad33b9bc6eb81fd48090c7 100644 (file)
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -178,9 +178,8 @@ config ISCSI_IBFT
          Otherwise, say N.
 
 config RASPBERRYPI_FIRMWARE
-       bool "Raspberry Pi Firmware Driver"
+       tristate "Raspberry Pi Firmware Driver"
        depends on BCM2835_MBOX
-       default USB_PCI
        help
          This option enables support for communicating with the firmware on the
          Raspberry Pi.

diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index b8961c0381cfd4fe87eca833834dfd65d0eac786..a81f03f95649e17f647ff5988836daca98e28c8f 100644 (file)
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -17,8 +17,6 @@
 #include <linux/acpi.h>
 #include <linux/dmi.h>
 
-#include <soc/bcm2835/raspberrypi-firmware.h>
-
 #include "pci-quirks.h"
 #include "xhci-ext-caps.h"
 
@@ -1246,24 +1244,11 @@ iounmap:
 
 static void quirk_usb_early_handoff(struct pci_dev *pdev)
 {
-       int ret;
-
        /* Skip Netlogic mips SoC's internal PCI USB controller.
         * This device does not need/support EHCI/OHCI handoff
         */
        if (pdev->vendor == 0x184e)     /* vendor Netlogic */
                return;
-
-       if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) {
-               ret = rpi_firmware_init_vl805(pdev);
-               if (ret) {
-                       /* Firmware might be outdated, or something failed */
-                       dev_warn(&pdev->dev,
-                                "Failed to load VL805's firmware: %d. Will continue to attempt to work, but bad things might happen. You should fix this...\n",
-                                ret);
-               }
-       }
-
        if (pdev->class != PCI_CLASS_SERIAL_USB_UHCI &&
                        pdev->class != PCI_CLASS_SERIAL_USB_OHCI &&
                        pdev->class != PCI_CLASS_SERIAL_USB_EHCI &&