Revert "usb: xhci: Load Raspberry Pi 4 VL805's firmware"

After switching to Linux v5.10 based kernel and DTB for RPi4 there is no
need for custom handling of the XHCI firmware upload. It will be properly
handled by the mainline u-boot's raspberry-pi firmware reset driver.

This reverts commit c3d57c4a00cf39aa885aa65a26eb4aa984b7f0fd.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I27b51249fbb904d4d3dd18f82671c7d5b8305008

diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index c721cf801ad52462f434e870f18321135af0943d..82fde5f112bf82c5a004622c0791a6f9b45dd7a3 100644 (file)
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -14,7 +14,6 @@
 #include <lcd.h>
 #include <memalign.h>
 #include <mmc.h>
-#include <usb/xhci.h>
 #include <asm/gpio.h>
 #include <asm/arch/mbox.h>
 #include <asm/arch/msg.h>

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 4438091ef98612aea6e0e3459abec55a12198716..9fb6d2f763532bb17ce2e735dd972c74d20a178d 100644 (file)
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -13,10 +13,6 @@
 #include <usb.h>
 #include <usb/xhci.h>
 
-__weak void xhci_pci_fixup(struct udevice *dev)
-{
-}
-
 static void xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr,
                          struct xhci_hcor **ret_hcor)
 {
@@ -46,8 +42,6 @@ static int xhci_pci_probe(struct udevice *dev)
        struct xhci_hccr *hccr;
        struct xhci_hcor *hcor;
 
-       xhci_pci_fixup(dev);
-
        xhci_pci_init(dev, &hccr, &hcor);
 
        return xhci_register(dev, hccr, hcor);

diff --git a/include/usb/xhci.h b/include/usb/xhci.h
index 75b374cbf48d896f5f29fe63f955a4c294df4e33..7d34103fd5ca147083cab16d0876dd5803bfe22c 100644 (file)
--- a/include/usb/xhci.h
+++ b/include/usb/xhci.h
@@ -17,7 +17,6 @@
 #define HOST_XHCI_H_
 
 #include <reset.h>
-#include <usb.h>
 #include <asm/types.h>
 #include <asm/cache.h>
 #include <asm/io.h>
@@ -1287,6 +1286,4 @@ extern struct dm_usb_ops xhci_usb_ops;
 
 struct xhci_ctrl *xhci_get_ctrl(struct usb_device *udev);
 
-extern void xhci_pci_fixup(struct udevice *dev);
-
 #endif /* HOST_XHCI_H_ */