Arnd Bergmann c5418a0b98 usb: gadget: pxa25x_udc: move register definitions from arch ... ixp4xx and pxa25x both use this driver and provide a slightly different set of register definitions for it. Aside from that, the definition in the ixp4xx-regs.h header conflicts with the on in the pxa27x device driver when compile-testing that: In file included from ../drivers/usb/gadget/udc/pxa27x_udc.c:37:0: ../drivers/usb/gadget/udc/pxa27x_udc.h:26:0: warning: "UDCCR" redefined #define UDCCR 0x0000 /* UDC Control Register */ ^ In file included from ../arch/arm/mach-ixp4xx/include/mach/hardware.h:27:0, from ../arch/arm/mach-ixp4xx/include/mach/io.h:18, from ../arch/arm/include/asm/io.h:194, from ../include/linux/io.h:25, from ../include/linux/irq.h:24, from ../drivers/usb/gadget/udc/pxa27x_udc.c:23: ../arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h:415:0: note: this is the location of the previous definition #define UDCCR IXP4XX_USB_REG(IXP4XX_USB_BASE_VIRT+0x0000) This addresses both issues by moving all the definitions into the pxa25x_udc driver itself. It turns out the only difference between them was 'UDCCS_IO_ROF', and that could well be a mistake when it was incorrectly copied from pxa25x to ixp4xx. Acked-by: Krzysztof Halasa <khalasa@piap.pl> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Felipe Balbi <balbi@kernel.org>		2016-03-04 15:14:28 +02:00
..
include/mach	usb: gadget: pxa25x_udc: move register definitions from arch	2016-03-04 15:14:28 +02:00
avila-pci.c
avila-setup.c
common-pci.c
common.c	ARM: kill off set_irq_flags usage	2015-07-28 13:58:13 +02:00
coyote-pci.c
coyote-setup.c
dsmg600-pci.c
dsmg600-setup.c
fsg-pci.c
fsg-setup.c
gateway7001-pci.c
gateway7001-setup.c
goramo_mlr.c
gtwx5715-pci.c
gtwx5715-setup.c
ixdp425-pci.c
ixdp425-setup.c	ARM: make use of nand_set/get_controller_data() helpers	2016-01-07 10:23:40 -08:00
ixdpg425-pci.c
ixp4xx_npe.c
ixp4xx_qmgr.c
Kconfig
Makefile
Makefile.boot
miccpt-pci.c
nas100d-pci.c
nas100d-setup.c
nslu2-pci.c
nslu2-setup.c
omixp-setup.c
vulcan-pci.c
vulcan-setup.c
wg302v2-pci.c
wg302v2-setup.c