diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 12:30:25 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 12:30:25 -0400 |
| commit | 995a0605a6665858d73f9e80053414909be33f27 (patch) | |
| tree | fcc66a6a77acdaae492f77c0c58c0233db74a2b4 /drivers/usb/musb/musb_regs.h | |
| parent | a32750c2ca6f697903b19063fc86f4272865e3a1 (diff) | |
| parent | 677d3e2f07d1b3d6d2f76fd5552d16a53b9236a0 (diff) | |
Merge branch 'at91/trng' into next/driver
Diffstat (limited to 'drivers/usb/musb/musb_regs.h')
| -rw-r--r-- | drivers/usb/musb/musb_regs.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h index 82410703dcd3..03f2655af290 100644 --- a/drivers/usb/musb/musb_regs.h +++ b/drivers/usb/musb/musb_regs.h | |||
| @@ -234,7 +234,8 @@ | |||
| 234 | #define MUSB_TESTMODE 0x0F /* 8 bit */ | 234 | #define MUSB_TESTMODE 0x0F /* 8 bit */ |
| 235 | 235 | ||
| 236 | /* Get offset for a given FIFO from musb->mregs */ | 236 | /* Get offset for a given FIFO from musb->mregs */ |
| 237 | #ifdef CONFIG_USB_MUSB_TUSB6010 | 237 | #if defined(CONFIG_USB_MUSB_TUSB6010) || \ |
| 238 | defined(CONFIG_USB_MUSB_TUSB6010_MODULE) | ||
| 238 | #define MUSB_FIFO_OFFSET(epnum) (0x200 + ((epnum) * 0x20)) | 239 | #define MUSB_FIFO_OFFSET(epnum) (0x200 + ((epnum) * 0x20)) |
| 239 | #else | 240 | #else |
| 240 | #define MUSB_FIFO_OFFSET(epnum) (0x20 + ((epnum) * 4)) | 241 | #define MUSB_FIFO_OFFSET(epnum) (0x20 + ((epnum) * 4)) |
| @@ -295,7 +296,8 @@ | |||
| 295 | #define MUSB_FLAT_OFFSET(_epnum, _offset) \ | 296 | #define MUSB_FLAT_OFFSET(_epnum, _offset) \ |
| 296 | (0x100 + (0x10*(_epnum)) + (_offset)) | 297 | (0x100 + (0x10*(_epnum)) + (_offset)) |
| 297 | 298 | ||
| 298 | #ifdef CONFIG_USB_MUSB_TUSB6010 | 299 | #if defined(CONFIG_USB_MUSB_TUSB6010) || \ |
| 300 | defined(CONFIG_USB_MUSB_TUSB6010_MODULE) | ||
| 299 | /* TUSB6010 EP0 configuration register is special */ | 301 | /* TUSB6010 EP0 configuration register is special */ |
| 300 | #define MUSB_TUSB_OFFSET(_epnum, _offset) \ | 302 | #define MUSB_TUSB_OFFSET(_epnum, _offset) \ |
| 301 | (0x10 + _offset) | 303 | (0x10 + _offset) |