USB: UHCI: Support non-PCI host controllers

[~andy/linux] / drivers / usb / host / uhci-hcd.h

diff --git a/drivers/usb/host/uhci-hcd.h b/drivers/usb/host/uhci-hcd.h
index a6de241bf96652578da3c5bf22834bab694fb73f..a4e64d08f0200ce036de703192ba4bdb5af23564 100644 (file)
--- a/drivers/usb/host/uhci-hcd.h
+++ b/drivers/usb/host/uhci-hcd.h
@@ -380,6 +380,9 @@ struct uhci_hcd {
        /* Grabbed from PCI */
        unsigned long io_addr;
 
+       /* Used when registers are memory mapped */
+       void __iomem *regs;
+
        struct dma_pool *qh_pool;
        struct dma_pool *td_pool;
 
@@ -481,6 +484,14 @@ struct urb_priv {
 #define PCI_VENDOR_ID_GENESYS          0x17a0
 #define PCI_DEVICE_ID_GL880S_UHCI      0x8083
 
+/*
+ * Functions used to access controller registers. The UCHI spec says that host
+ * controller I/O registers are mapped into PCI I/O space. For non-PCI hosts
+ * we use memory mapped registers.
+ */
+
+#if !defined(CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC)
+/* Support PCI only */
 static inline u32 uhci_readl(struct uhci_hcd *uhci, int reg)
 {
        return inl(uhci->io_addr + reg);
@@ -511,4 +522,58 @@ static inline void uhci_writeb(struct uhci_hcd *uhci, u8 val, int reg)
        outb(val, uhci->io_addr + reg);
 }
 
+#else
+/* Support PCI and non-PCI host controllers */
+
+#define uhci_has_pci_registers(u)      ((u)->io_addr != 0)
+
+static inline u32 uhci_readl(struct uhci_hcd *uhci, int reg)
+{
+       if (uhci_has_pci_registers(uhci))
+               return inl(uhci->io_addr + reg);
+       else
+               return readl(uhci->regs + reg);
+}
+
+static inline void uhci_writel(struct uhci_hcd *uhci, u32 val, int reg)
+{
+       if (uhci_has_pci_registers(uhci))
+               outl(val, uhci->io_addr + reg);
+       else
+               writel(val, uhci->regs + reg);
+}
+
+static inline u16 uhci_readw(struct uhci_hcd *uhci, int reg)
+{
+       if (uhci_has_pci_registers(uhci))
+               return inw(uhci->io_addr + reg);
+       else
+               return readw(uhci->regs + reg);
+}
+
+static inline void uhci_writew(struct uhci_hcd *uhci, u16 val, int reg)
+{
+       if (uhci_has_pci_registers(uhci))
+               outw(val, uhci->io_addr + reg);
+       else
+               writew(val, uhci->regs + reg);
+}
+
+static inline u8 uhci_readb(struct uhci_hcd *uhci, int reg)
+{
+       if (uhci_has_pci_registers(uhci))
+               return inb(uhci->io_addr + reg);
+       else
+               return readb(uhci->regs + reg);
+}
+
+static inline void uhci_writeb(struct uhci_hcd *uhci, u8 val, int reg)
+{
+       if (uhci_has_pci_registers(uhci))
+               outb(val, uhci->io_addr + reg);
+       else
+               writeb(val, uhci->regs + reg);
+}
+#endif /* !defined(CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC) */
+
 #endif