diff options
Diffstat (limited to 'drivers/usb/host/isp1760-hcd.h')
-rw-r--r-- | drivers/usb/host/isp1760-hcd.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/host/isp1760-hcd.h b/drivers/usb/host/isp1760-hcd.h index 014a7dfadf91..33dc79ccaa6b 100644 --- a/drivers/usb/host/isp1760-hcd.h +++ b/drivers/usb/host/isp1760-hcd.h | |||
@@ -4,6 +4,7 @@ | |||
4 | /* exports for if */ | 4 | /* exports for if */ |
5 | struct usb_hcd *isp1760_register(phys_addr_t res_start, resource_size_t res_len, | 5 | struct usb_hcd *isp1760_register(phys_addr_t res_start, resource_size_t res_len, |
6 | int irq, unsigned long irqflags, | 6 | int irq, unsigned long irqflags, |
7 | int rst_gpio, | ||
7 | struct device *dev, const char *busname, | 8 | struct device *dev, const char *busname, |
8 | unsigned int devflags); | 9 | unsigned int devflags); |
9 | int init_kmem_once(void); | 10 | int init_kmem_once(void); |
@@ -73,7 +74,6 @@ void deinit_kmem_cache(void); | |||
73 | #define HC_EOT_INT (1 << 3) | 74 | #define HC_EOT_INT (1 << 3) |
74 | #define HC_SOT_INT (1 << 1) | 75 | #define HC_SOT_INT (1 << 1) |
75 | #define INTERRUPT_ENABLE_MASK (HC_INTL_INT | HC_ATL_INT) | 76 | #define INTERRUPT_ENABLE_MASK (HC_INTL_INT | HC_ATL_INT) |
76 | #define INTERRUPT_ENABLE_SOT_MASK (HC_SOT_INT) | ||
77 | 77 | ||
78 | #define HC_ISO_IRQ_MASK_OR_REG 0x318 | 78 | #define HC_ISO_IRQ_MASK_OR_REG 0x318 |
79 | #define HC_INT_IRQ_MASK_OR_REG 0x31C | 79 | #define HC_INT_IRQ_MASK_OR_REG 0x31C |
@@ -107,6 +107,7 @@ struct ptd { | |||
107 | struct slotinfo { | 107 | struct slotinfo { |
108 | struct isp1760_qh *qh; | 108 | struct isp1760_qh *qh; |
109 | struct isp1760_qtd *qtd; | 109 | struct isp1760_qtd *qtd; |
110 | unsigned long timestamp; | ||
110 | }; | 111 | }; |
111 | 112 | ||
112 | 113 | ||
@@ -126,6 +127,7 @@ typedef void (packet_enqueue)(struct usb_hcd *hcd, struct isp1760_qh *qh, | |||
126 | #define ISP1760_FLAG_ISP1761 0x00000040 /* Chip is ISP1761 */ | 127 | #define ISP1760_FLAG_ISP1761 0x00000040 /* Chip is ISP1761 */ |
127 | #define ISP1760_FLAG_INTR_POL_HIGH 0x00000080 /* Interrupt polarity active high */ | 128 | #define ISP1760_FLAG_INTR_POL_HIGH 0x00000080 /* Interrupt polarity active high */ |
128 | #define ISP1760_FLAG_INTR_EDGE_TRIG 0x00000100 /* Interrupt edge triggered */ | 129 | #define ISP1760_FLAG_INTR_EDGE_TRIG 0x00000100 /* Interrupt edge triggered */ |
130 | #define ISP1760_FLAG_RESET_ACTIVE_HIGH 0x80000000 /* RESET GPIO active high */ | ||
129 | 131 | ||
130 | /* chip memory management */ | 132 | /* chip memory management */ |
131 | struct memory_chunk { | 133 | struct memory_chunk { |
@@ -188,6 +190,7 @@ struct memory_chunk { | |||
188 | #define DW3_BABBLE_BIT (1 << 29) | 190 | #define DW3_BABBLE_BIT (1 << 29) |
189 | #define DW3_HALT_BIT (1 << 30) | 191 | #define DW3_HALT_BIT (1 << 30) |
190 | #define DW3_ACTIVE_BIT (1 << 31) | 192 | #define DW3_ACTIVE_BIT (1 << 31) |
193 | #define FROM_DW3_ACTIVE(x) (((x) >> 31) & 0x01) | ||
191 | 194 | ||
192 | #define INT_UNDERRUN (1 << 2) | 195 | #define INT_UNDERRUN (1 << 2) |
193 | #define INT_BABBLE (1 << 1) | 196 | #define INT_BABBLE (1 << 1) |