Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d0712de authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-for-v4.6' of http://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next 

Felipe writes:

usb changes for v4.6 merge window

This is almost all under drivers/usb/dwc2/. Many
changes to the host side implementation of dwc2 have
been done by Douglas Anderson.

We also have USB 3.1 support added to the Gadget
Framework and, because of that work, dwc3 got
support to Synopsys new DWC_usb31 IP core.

Other than these 2 important series, we also have
the usual collection of non-critical fixes,
Documentation updates, and minor changes all over
the place.
parents 83253b3b 0561f77e

Documentation/devicetree/bindings/usb/dwc2.txt

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ Required properties: 
  - rockchip,rk3066-usb: The DWC2 USB controller instance in the rk3066 Soc;

  - "rockchip,rk3188-usb", "rockchip,rk3066-usb", "snps,dwc2": for rk3188 Soc;

  - "rockchip,rk3288-usb", "rockchip,rk3066-usb", "snps,dwc2": for rk3288 Soc;

  - "lantiq,arx100-usb": The DWC2 USB controller instance in Lantiq ARX SoCs;

  - "lantiq,xrx200-usb": The DWC2 USB controller instance in Lantiq XRX SoCs;

  - snps,dwc2: A generic DWC2 USB controller with default parameters.

- reg : Should contain 1 register range (address and length)

- interrupts : Should contain 1 interrupt

Documentation/usb/chipidea.txt

+5 −4
Original line number Diff line number Diff line
@@ -26,16 +26,17 @@ cat /sys/kernel/debug/ci_hdrc.0/registers 
   On B-device:

   echo 1 > /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req



   if HNP polling is not supported, also need:

   On A-device:

   echo 0 > /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_req



   B-device should take host role and enumrate A-device.



4) A-device switch back to host.

   On B-device:

   echo 0 > /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req



   or, by introducing HNP polling, B-Host can know when A-peripheral wish

   to be host role, so this role switch also can be trigged in A-peripheral

   side by answering the polling from B-Host, this can be done on A-device:

   echo 1 > /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_req



   A-device should switch back to host and enumrate B-device.



5) Remove B-device(unplug micro B plug) and insert again in 10 seconds,

arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h

+0 −198
Original line number Diff line number Diff line
@@ -395,204 +395,6 @@ 
#define CRP_AD_CBE_BESL         20

#define CRP_AD_CBE_WRITE	0x00010000





/*

 * USB Device Controller

 *

 * These are used by the USB gadget driver, so they don't follow the

 * IXP4XX_ naming convetions.

 *

 */

# define IXP4XX_USB_REG(x)       (*((volatile u32 *)(x)))



/* UDC Undocumented - Reserved1 */

#define UDC_RES1	IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0004)  

/* UDC Undocumented - Reserved2 */

#define UDC_RES2	IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0008)  

/* UDC Undocumented - Reserved3 */

#define UDC_RES3	IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x000C)  

/* UDC Control Register */

#define UDCCR		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0000)  

/* UDC Endpoint 0 Control/Status Register */

#define UDCCS0		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0010)  

/* UDC Endpoint 1 (IN) Control/Status Register */

#define UDCCS1		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0014)  

/* UDC Endpoint 2 (OUT) Control/Status Register */

#define UDCCS2		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0018)  

/* UDC Endpoint 3 (IN) Control/Status Register */

#define UDCCS3		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x001C)  

/* UDC Endpoint 4 (OUT) Control/Status Register */

#define UDCCS4		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0020)  

/* UDC Endpoint 5 (Interrupt) Control/Status Register */

#define UDCCS5		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0024)  

/* UDC Endpoint 6 (IN) Control/Status Register */

#define UDCCS6		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0028)  

/* UDC Endpoint 7 (OUT) Control/Status Register */

#define UDCCS7		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x002C)  

/* UDC Endpoint 8 (IN) Control/Status Register */

#define UDCCS8		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0030)  

/* UDC Endpoint 9 (OUT) Control/Status Register */

#define UDCCS9		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0034)  

/* UDC Endpoint 10 (Interrupt) Control/Status Register */

#define UDCCS10		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0038)  

/* UDC Endpoint 11 (IN) Control/Status Register */

#define UDCCS11		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x003C)  

/* UDC Endpoint 12 (OUT) Control/Status Register */

#define UDCCS12		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0040)  

/* UDC Endpoint 13 (IN) Control/Status Register */

#define UDCCS13		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0044)  

/* UDC Endpoint 14 (OUT) Control/Status Register */

#define UDCCS14		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0048)  

/* UDC Endpoint 15 (Interrupt) Control/Status Register */

#define UDCCS15		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x004C)  

/* UDC Frame Number Register High */

#define UFNRH		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0060)  

/* UDC Frame Number Register Low */

#define UFNRL		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0064)  

/* UDC Byte Count Reg 2 */

#define UBCR2		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0068)  

/* UDC Byte Count Reg 4 */

#define UBCR4		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x006c)  

/* UDC Byte Count Reg 7 */

#define UBCR7		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0070)  

/* UDC Byte Count Reg 9 */

#define UBCR9		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0074)  

/* UDC Byte Count Reg 12 */

#define UBCR12		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0078)  

/* UDC Byte Count Reg 14 */

#define UBCR14		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x007c)  

/* UDC Endpoint 0 Data Register */

#define UDDR0		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0080)  

/* UDC Endpoint 1 Data Register */

#define UDDR1		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0100)  

/* UDC Endpoint 2 Data Register */

#define UDDR2		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0180)  

/* UDC Endpoint 3 Data Register */

#define UDDR3		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0200)  

/* UDC Endpoint 4 Data Register */

#define UDDR4		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0400)  

/* UDC Endpoint 5 Data Register */

#define UDDR5		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x00A0)  

/* UDC Endpoint 6 Data Register */

#define UDDR6		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0600)  

/* UDC Endpoint 7 Data Register */

#define UDDR7		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0680)  

/* UDC Endpoint 8 Data Register */

#define UDDR8		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0700)  

/* UDC Endpoint 9 Data Register */

#define UDDR9		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0900)  

/* UDC Endpoint 10 Data Register */

#define UDDR10		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x00C0)  

/* UDC Endpoint 11 Data Register */

#define UDDR11		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0B00)  

/* UDC Endpoint 12 Data Register */

#define UDDR12		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0B80)  

/* UDC Endpoint 13 Data Register */

#define UDDR13		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0C00)  

/* UDC Endpoint 14 Data Register */

#define UDDR14		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0E00)  

/* UDC Endpoint 15 Data Register */

#define UDDR15		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x00E0)  

/* UDC Interrupt Control Register 0 */

#define UICR0		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0050)  

/* UDC Interrupt Control Register 1 */

#define UICR1		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0054)  

/* UDC Status Interrupt Register 0 */

#define USIR0		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0058)  

/* UDC Status Interrupt Register 1 */

#define USIR1		IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x005C)  



#define UDCCR_UDE	(1 << 0)	/* UDC enable */

#define UDCCR_UDA	(1 << 1)	/* UDC active */

#define UDCCR_RSM	(1 << 2)	/* Device resume */

#define UDCCR_RESIR	(1 << 3)	/* Resume interrupt request */

#define UDCCR_SUSIR	(1 << 4)	/* Suspend interrupt request */

#define UDCCR_SRM	(1 << 5)	/* Suspend/resume interrupt mask */

#define UDCCR_RSTIR	(1 << 6)	/* Reset interrupt request */

#define UDCCR_REM	(1 << 7)	/* Reset interrupt mask */



#define UDCCS0_OPR	(1 << 0)	/* OUT packet ready */

#define UDCCS0_IPR	(1 << 1)	/* IN packet ready */

#define UDCCS0_FTF	(1 << 2)	/* Flush Tx FIFO */

#define UDCCS0_DRWF	(1 << 3)	/* Device remote wakeup feature */

#define UDCCS0_SST	(1 << 4)	/* Sent stall */

#define UDCCS0_FST	(1 << 5)	/* Force stall */

#define UDCCS0_RNE	(1 << 6)	/* Receive FIFO no empty */

#define UDCCS0_SA	(1 << 7)	/* Setup active */



#define UDCCS_BI_TFS	(1 << 0)	/* Transmit FIFO service */

#define UDCCS_BI_TPC	(1 << 1)	/* Transmit packet complete */

#define UDCCS_BI_FTF	(1 << 2)	/* Flush Tx FIFO */

#define UDCCS_BI_TUR	(1 << 3)	/* Transmit FIFO underrun */

#define UDCCS_BI_SST	(1 << 4)	/* Sent stall */

#define UDCCS_BI_FST	(1 << 5)	/* Force stall */

#define UDCCS_BI_TSP	(1 << 7)	/* Transmit short packet */



#define UDCCS_BO_RFS	(1 << 0)	/* Receive FIFO service */

#define UDCCS_BO_RPC	(1 << 1)	/* Receive packet complete */

#define UDCCS_BO_DME	(1 << 3)	/* DMA enable */

#define UDCCS_BO_SST	(1 << 4)	/* Sent stall */

#define UDCCS_BO_FST	(1 << 5)	/* Force stall */

#define UDCCS_BO_RNE	(1 << 6)	/* Receive FIFO not empty */

#define UDCCS_BO_RSP	(1 << 7)	/* Receive short packet */



#define UDCCS_II_TFS	(1 << 0)	/* Transmit FIFO service */

#define UDCCS_II_TPC	(1 << 1)	/* Transmit packet complete */

#define UDCCS_II_FTF	(1 << 2)	/* Flush Tx FIFO */

#define UDCCS_II_TUR	(1 << 3)	/* Transmit FIFO underrun */

#define UDCCS_II_TSP	(1 << 7)	/* Transmit short packet */



#define UDCCS_IO_RFS	(1 << 0)	/* Receive FIFO service */

#define UDCCS_IO_RPC	(1 << 1)	/* Receive packet complete */

#define UDCCS_IO_ROF	(1 << 3)	/* Receive overflow */

#define UDCCS_IO_DME	(1 << 3)	/* DMA enable */

#define UDCCS_IO_RNE	(1 << 6)	/* Receive FIFO not empty */

#define UDCCS_IO_RSP	(1 << 7)	/* Receive short packet */



#define UDCCS_INT_TFS	(1 << 0)	/* Transmit FIFO service */

#define UDCCS_INT_TPC	(1 << 1)	/* Transmit packet complete */

#define UDCCS_INT_FTF	(1 << 2)	/* Flush Tx FIFO */

#define UDCCS_INT_TUR	(1 << 3)	/* Transmit FIFO underrun */

#define UDCCS_INT_SST	(1 << 4)	/* Sent stall */

#define UDCCS_INT_FST	(1 << 5)	/* Force stall */

#define UDCCS_INT_TSP	(1 << 7)	/* Transmit short packet */



#define UICR0_IM0	(1 << 0)	/* Interrupt mask ep 0 */

#define UICR0_IM1	(1 << 1)	/* Interrupt mask ep 1 */

#define UICR0_IM2	(1 << 2)	/* Interrupt mask ep 2 */

#define UICR0_IM3	(1 << 3)	/* Interrupt mask ep 3 */

#define UICR0_IM4	(1 << 4)	/* Interrupt mask ep 4 */

#define UICR0_IM5	(1 << 5)	/* Interrupt mask ep 5 */

#define UICR0_IM6	(1 << 6)	/* Interrupt mask ep 6 */

#define UICR0_IM7	(1 << 7)	/* Interrupt mask ep 7 */



#define UICR1_IM8	(1 << 0)	/* Interrupt mask ep 8 */

#define UICR1_IM9	(1 << 1)	/* Interrupt mask ep 9 */

#define UICR1_IM10	(1 << 2)	/* Interrupt mask ep 10 */

#define UICR1_IM11	(1 << 3)	/* Interrupt mask ep 11 */

#define UICR1_IM12	(1 << 4)	/* Interrupt mask ep 12 */

#define UICR1_IM13	(1 << 5)	/* Interrupt mask ep 13 */

#define UICR1_IM14	(1 << 6)	/* Interrupt mask ep 14 */

#define UICR1_IM15	(1 << 7)	/* Interrupt mask ep 15 */



#define USIR0_IR0	(1 << 0)	/* Interrupt request ep 0 */

#define USIR0_IR1	(1 << 1)	/* Interrupt request ep 1 */

#define USIR0_IR2	(1 << 2)	/* Interrupt request ep 2 */

#define USIR0_IR3	(1 << 3)	/* Interrupt request ep 3 */

#define USIR0_IR4	(1 << 4)	/* Interrupt request ep 4 */

#define USIR0_IR5	(1 << 5)	/* Interrupt request ep 5 */

#define USIR0_IR6	(1 << 6)	/* Interrupt request ep 6 */

#define USIR0_IR7	(1 << 7)	/* Interrupt request ep 7 */



#define USIR1_IR8	(1 << 0)	/* Interrupt request ep 8 */

#define USIR1_IR9	(1 << 1)	/* Interrupt request ep 9 */

#define USIR1_IR10	(1 << 2)	/* Interrupt request ep 10 */

#define USIR1_IR11	(1 << 3)	/* Interrupt request ep 11 */

#define USIR1_IR12	(1 << 4)	/* Interrupt request ep 12 */

#define USIR1_IR13	(1 << 5)	/* Interrupt request ep 13 */

#define USIR1_IR14	(1 << 6)	/* Interrupt request ep 14 */

#define USIR1_IR15	(1 << 7)	/* Interrupt request ep 15 */



#define DCMD_LENGTH	0x01fff		/* length mask (max = 8K - 1) */



/* "fuse" bits of IXP_EXP_CFG2 */

arch/arm/mach-pxa/include/mach/pxa25x-udc.h

+0 −163
Original line number Diff line number Diff line 
#ifndef _ASM_ARCH_PXA25X_UDC_H

#define _ASM_ARCH_PXA25X_UDC_H



#ifdef _ASM_ARCH_PXA27X_UDC_H

#error "You can't include both PXA25x and PXA27x UDC support"

#endif



#define UDC_RES1	__REG(0x40600004)  /* UDC Undocumented - Reserved1 */

#define UDC_RES2	__REG(0x40600008)  /* UDC Undocumented - Reserved2 */

#define UDC_RES3	__REG(0x4060000C)  /* UDC Undocumented - Reserved3 */



#define UDCCR		__REG(0x40600000)  /* UDC Control Register */

#define UDCCR_UDE	(1 << 0)	/* UDC enable */

#define UDCCR_UDA	(1 << 1)	/* UDC active */

#define UDCCR_RSM	(1 << 2)	/* Device resume */

#define UDCCR_RESIR	(1 << 3)	/* Resume interrupt request */

#define UDCCR_SUSIR	(1 << 4)	/* Suspend interrupt request */

#define UDCCR_SRM	(1 << 5)	/* Suspend/resume interrupt mask */

#define UDCCR_RSTIR	(1 << 6)	/* Reset interrupt request */

#define UDCCR_REM	(1 << 7)	/* Reset interrupt mask */



#define UDCCS0		__REG(0x40600010)  /* UDC Endpoint 0 Control/Status Register */

#define UDCCS0_OPR	(1 << 0)	/* OUT packet ready */

#define UDCCS0_IPR	(1 << 1)	/* IN packet ready */

#define UDCCS0_FTF	(1 << 2)	/* Flush Tx FIFO */

#define UDCCS0_DRWF	(1 << 3)	/* Device remote wakeup feature */

#define UDCCS0_SST	(1 << 4)	/* Sent stall */

#define UDCCS0_FST	(1 << 5)	/* Force stall */

#define UDCCS0_RNE	(1 << 6)	/* Receive FIFO no empty */

#define UDCCS0_SA	(1 << 7)	/* Setup active */



/* Bulk IN - Endpoint 1,6,11 */

#define UDCCS1		__REG(0x40600014)  /* UDC Endpoint 1 (IN) Control/Status Register */

#define UDCCS6		__REG(0x40600028)  /* UDC Endpoint 6 (IN) Control/Status Register */

#define UDCCS11		__REG(0x4060003C)  /* UDC Endpoint 11 (IN) Control/Status Register */



#define UDCCS_BI_TFS	(1 << 0)	/* Transmit FIFO service */

#define UDCCS_BI_TPC	(1 << 1)	/* Transmit packet complete */

#define UDCCS_BI_FTF	(1 << 2)	/* Flush Tx FIFO */

#define UDCCS_BI_TUR	(1 << 3)	/* Transmit FIFO underrun */

#define UDCCS_BI_SST	(1 << 4)	/* Sent stall */

#define UDCCS_BI_FST	(1 << 5)	/* Force stall */

#define UDCCS_BI_TSP	(1 << 7)	/* Transmit short packet */



/* Bulk OUT - Endpoint 2,7,12 */

#define UDCCS2		__REG(0x40600018)  /* UDC Endpoint 2 (OUT) Control/Status Register */

#define UDCCS7		__REG(0x4060002C)  /* UDC Endpoint 7 (OUT) Control/Status Register */

#define UDCCS12		__REG(0x40600040)  /* UDC Endpoint 12 (OUT) Control/Status Register */



#define UDCCS_BO_RFS	(1 << 0)	/* Receive FIFO service */

#define UDCCS_BO_RPC	(1 << 1)	/* Receive packet complete */

#define UDCCS_BO_DME	(1 << 3)	/* DMA enable */

#define UDCCS_BO_SST	(1 << 4)	/* Sent stall */

#define UDCCS_BO_FST	(1 << 5)	/* Force stall */

#define UDCCS_BO_RNE	(1 << 6)	/* Receive FIFO not empty */

#define UDCCS_BO_RSP	(1 << 7)	/* Receive short packet */



/* Isochronous IN - Endpoint 3,8,13 */

#define UDCCS3		__REG(0x4060001C)  /* UDC Endpoint 3 (IN) Control/Status Register */

#define UDCCS8		__REG(0x40600030)  /* UDC Endpoint 8 (IN) Control/Status Register */

#define UDCCS13		__REG(0x40600044)  /* UDC Endpoint 13 (IN) Control/Status Register */



#define UDCCS_II_TFS	(1 << 0)	/* Transmit FIFO service */

#define UDCCS_II_TPC	(1 << 1)	/* Transmit packet complete */

#define UDCCS_II_FTF	(1 << 2)	/* Flush Tx FIFO */

#define UDCCS_II_TUR	(1 << 3)	/* Transmit FIFO underrun */

#define UDCCS_II_TSP	(1 << 7)	/* Transmit short packet */



/* Isochronous OUT - Endpoint 4,9,14 */

#define UDCCS4		__REG(0x40600020)  /* UDC Endpoint 4 (OUT) Control/Status Register */

#define UDCCS9		__REG(0x40600034)  /* UDC Endpoint 9 (OUT) Control/Status Register */

#define UDCCS14		__REG(0x40600048)  /* UDC Endpoint 14 (OUT) Control/Status Register */



#define UDCCS_IO_RFS	(1 << 0)	/* Receive FIFO service */

#define UDCCS_IO_RPC	(1 << 1)	/* Receive packet complete */

#define UDCCS_IO_ROF	(1 << 2)	/* Receive overflow */

#define UDCCS_IO_DME	(1 << 3)	/* DMA enable */

#define UDCCS_IO_RNE	(1 << 6)	/* Receive FIFO not empty */

#define UDCCS_IO_RSP	(1 << 7)	/* Receive short packet */



/* Interrupt IN - Endpoint 5,10,15 */

#define UDCCS5		__REG(0x40600024)  /* UDC Endpoint 5 (Interrupt) Control/Status Register */

#define UDCCS10		__REG(0x40600038)  /* UDC Endpoint 10 (Interrupt) Control/Status Register */

#define UDCCS15		__REG(0x4060004C)  /* UDC Endpoint 15 (Interrupt) Control/Status Register */



#define UDCCS_INT_TFS	(1 << 0)	/* Transmit FIFO service */

#define UDCCS_INT_TPC	(1 << 1)	/* Transmit packet complete */

#define UDCCS_INT_FTF	(1 << 2)	/* Flush Tx FIFO */

#define UDCCS_INT_TUR	(1 << 3)	/* Transmit FIFO underrun */

#define UDCCS_INT_SST	(1 << 4)	/* Sent stall */

#define UDCCS_INT_FST	(1 << 5)	/* Force stall */

#define UDCCS_INT_TSP	(1 << 7)	/* Transmit short packet */



#define UFNRH		__REG(0x40600060)  /* UDC Frame Number Register High */

#define UFNRL		__REG(0x40600064)  /* UDC Frame Number Register Low */

#define UBCR2		__REG(0x40600068)  /* UDC Byte Count Reg 2 */

#define UBCR4		__REG(0x4060006c)  /* UDC Byte Count Reg 4 */

#define UBCR7		__REG(0x40600070)  /* UDC Byte Count Reg 7 */

#define UBCR9		__REG(0x40600074)  /* UDC Byte Count Reg 9 */

#define UBCR12		__REG(0x40600078)  /* UDC Byte Count Reg 12 */

#define UBCR14		__REG(0x4060007c)  /* UDC Byte Count Reg 14 */

#define UDDR0		__REG(0x40600080)  /* UDC Endpoint 0 Data Register */

#define UDDR1		__REG(0x40600100)  /* UDC Endpoint 1 Data Register */

#define UDDR2		__REG(0x40600180)  /* UDC Endpoint 2 Data Register */

#define UDDR3		__REG(0x40600200)  /* UDC Endpoint 3 Data Register */

#define UDDR4		__REG(0x40600400)  /* UDC Endpoint 4 Data Register */

#define UDDR5		__REG(0x406000A0)  /* UDC Endpoint 5 Data Register */

#define UDDR6		__REG(0x40600600)  /* UDC Endpoint 6 Data Register */

#define UDDR7		__REG(0x40600680)  /* UDC Endpoint 7 Data Register */

#define UDDR8		__REG(0x40600700)  /* UDC Endpoint 8 Data Register */

#define UDDR9		__REG(0x40600900)  /* UDC Endpoint 9 Data Register */

#define UDDR10		__REG(0x406000C0)  /* UDC Endpoint 10 Data Register */

#define UDDR11		__REG(0x40600B00)  /* UDC Endpoint 11 Data Register */

#define UDDR12		__REG(0x40600B80)  /* UDC Endpoint 12 Data Register */

#define UDDR13		__REG(0x40600C00)  /* UDC Endpoint 13 Data Register */

#define UDDR14		__REG(0x40600E00)  /* UDC Endpoint 14 Data Register */

#define UDDR15		__REG(0x406000E0)  /* UDC Endpoint 15 Data Register */



#define UICR0		__REG(0x40600050)  /* UDC Interrupt Control Register 0 */



#define UICR0_IM0	(1 << 0)	/* Interrupt mask ep 0 */

#define UICR0_IM1	(1 << 1)	/* Interrupt mask ep 1 */

#define UICR0_IM2	(1 << 2)	/* Interrupt mask ep 2 */

#define UICR0_IM3	(1 << 3)	/* Interrupt mask ep 3 */

#define UICR0_IM4	(1 << 4)	/* Interrupt mask ep 4 */

#define UICR0_IM5	(1 << 5)	/* Interrupt mask ep 5 */

#define UICR0_IM6	(1 << 6)	/* Interrupt mask ep 6 */

#define UICR0_IM7	(1 << 7)	/* Interrupt mask ep 7 */



#define UICR1		__REG(0x40600054)  /* UDC Interrupt Control Register 1 */



#define UICR1_IM8	(1 << 0)	/* Interrupt mask ep 8 */

#define UICR1_IM9	(1 << 1)	/* Interrupt mask ep 9 */

#define UICR1_IM10	(1 << 2)	/* Interrupt mask ep 10 */

#define UICR1_IM11	(1 << 3)	/* Interrupt mask ep 11 */

#define UICR1_IM12	(1 << 4)	/* Interrupt mask ep 12 */

#define UICR1_IM13	(1 << 5)	/* Interrupt mask ep 13 */

#define UICR1_IM14	(1 << 6)	/* Interrupt mask ep 14 */

#define UICR1_IM15	(1 << 7)	/* Interrupt mask ep 15 */



#define USIR0		__REG(0x40600058)  /* UDC Status Interrupt Register 0 */



#define USIR0_IR0	(1 << 0)	/* Interrupt request ep 0 */

#define USIR0_IR1	(1 << 1)	/* Interrupt request ep 1 */

#define USIR0_IR2	(1 << 2)	/* Interrupt request ep 2 */

#define USIR0_IR3	(1 << 3)	/* Interrupt request ep 3 */

#define USIR0_IR4	(1 << 4)	/* Interrupt request ep 4 */

#define USIR0_IR5	(1 << 5)	/* Interrupt request ep 5 */

#define USIR0_IR6	(1 << 6)	/* Interrupt request ep 6 */

#define USIR0_IR7	(1 << 7)	/* Interrupt request ep 7 */



#define USIR1		__REG(0x4060005C)  /* UDC Status Interrupt Register 1 */



#define USIR1_IR8	(1 << 0)	/* Interrupt request ep 8 */

#define USIR1_IR9	(1 << 1)	/* Interrupt request ep 9 */

#define USIR1_IR10	(1 << 2)	/* Interrupt request ep 10 */

#define USIR1_IR11	(1 << 3)	/* Interrupt request ep 11 */

#define USIR1_IR12	(1 << 4)	/* Interrupt request ep 12 */

#define USIR1_IR13	(1 << 5)	/* Interrupt request ep 13 */

#define USIR1_IR14	(1 << 6)	/* Interrupt request ep 14 */

#define USIR1_IR15	(1 << 7)	/* Interrupt request ep 15 */



#endif

drivers/usb/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ obj-$(CONFIG_USB_U132_HCD) += host/ 
obj-$(CONFIG_USB_R8A66597_HCD)	+= host/

obj-$(CONFIG_USB_HWA_HCD)	+= host/

obj-$(CONFIG_USB_IMX21_HCD)	+= host/

obj-$(CONFIG_USB_FSL_MPH_DR_OF)	+= host/

obj-$(CONFIG_USB_FSL_USB2)	+= host/

obj-$(CONFIG_USB_FOTG210_HCD)	+= host/

obj-$(CONFIG_USB_MAX3421_HCD)	+= host/