OSDN Git Service

usb: host: ehci-platform: Update brcm, xgs-iproc-ehci workaround
authorChris Packham <chris.packham@alliedtelesis.co.nz>
Tue, 15 Feb 2022 00:08:13 +0000 (13:08 +1300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 15 Feb 2022 14:11:23 +0000 (15:11 +0100)
The original workaround was added prior to commit e4788edc730a ("USB:
EHCI: Add alias for Broadcom INSNREG"). Now that brcm_insnreg exists in
struct ehci_regs we can use that instead of having a local definition.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Link: https://lore.kernel.org/r/20220215000813.1779032-1-chris.packham@alliedtelesis.co.nz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/ehci-platform.c

index c3dc906..1115431 100644 (file)
@@ -43,7 +43,6 @@
 #define hcd_to_ehci_priv(h) ((struct ehci_platform_priv *)hcd_to_ehci(h)->priv)
 
 #define BCM_USB_FIFO_THRESHOLD 0x00800040
-#define bcm_iproc_insnreg01    hostpc[0]
 
 struct ehci_platform_priv {
        struct clk *clks[EHCI_MAX_CLKS];
@@ -81,7 +80,7 @@ static int ehci_platform_reset(struct usb_hcd *hcd)
 
        if (of_device_is_compatible(pdev->dev.of_node, "brcm,xgs-iproc-ehci"))
                ehci_writel(ehci, BCM_USB_FIFO_THRESHOLD,
-                           &ehci->regs->bcm_iproc_insnreg01);
+                           &ehci->regs->brcm_insnreg[1]);
 
        return 0;
 }