Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-11 05:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit c65822fef4.

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>
This commit is contained in:
Nicolas Saenz Julienne 2020-06-29 18:18:42 +02:00 committed by Greg Kroah-Hartman
parent 768430e470
commit 83a06a102d
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/firmware/Kconfig
View File

@ -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.

15
drivers/usb/host/pci-quirks.c
View File

@ -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 &&