Commit 83a06a10 authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Greg Kroah-Hartman

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

This reverts commit c65822fe.

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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200629161845.6021-7-nsaenzjulienne@suse.deSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 768430e4
...@@ -178,9 +178,8 @@ config ISCSI_IBFT ...@@ -178,9 +178,8 @@ config ISCSI_IBFT
Otherwise, say N. Otherwise, say N.
config RASPBERRYPI_FIRMWARE config RASPBERRYPI_FIRMWARE
bool "Raspberry Pi Firmware Driver" tristate "Raspberry Pi Firmware Driver"
depends on BCM2835_MBOX depends on BCM2835_MBOX
default USB_PCI
help help
This option enables support for communicating with the firmware on the This option enables support for communicating with the firmware on the
Raspberry Pi. Raspberry Pi.
......
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <soc/bcm2835/raspberrypi-firmware.h>
#include "pci-quirks.h" #include "pci-quirks.h"
#include "xhci-ext-caps.h" #include "xhci-ext-caps.h"
...@@ -1246,24 +1244,11 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev) ...@@ -1246,24 +1244,11 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
static void quirk_usb_early_handoff(struct pci_dev *pdev) static void quirk_usb_early_handoff(struct pci_dev *pdev)
{ {
int ret;
/* Skip Netlogic mips SoC's internal PCI USB controller. /* Skip Netlogic mips SoC's internal PCI USB controller.
* This device does not need/support EHCI/OHCI handoff * This device does not need/support EHCI/OHCI handoff
*/ */
if (pdev->vendor == 0x184e) /* vendor Netlogic */ if (pdev->vendor == 0x184e) /* vendor Netlogic */
return; 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 && if (pdev->class != PCI_CLASS_SERIAL_USB_UHCI &&
pdev->class != PCI_CLASS_SERIAL_USB_OHCI && pdev->class != PCI_CLASS_SERIAL_USB_OHCI &&
pdev->class != PCI_CLASS_SERIAL_USB_EHCI && pdev->class != PCI_CLASS_SERIAL_USB_EHCI &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment