linux/arch/arm/mach-ixp4xx/include/mach
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
..
cpu.h ARM: ixp4xx: use __iomem pointers for MMIO 2012-09-19 15:19:13 +02:00
entry-macro.S ARM: remove disable_fiq and arch_ret_to_user macros 2012-02-21 17:05:18 -06:00
hardware.h ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol 2012-03-25 14:35:58 -05:00
io.h ARM: ixp4xx: fix read{b,w,l} return types 2015-12-01 23:45:30 +01:00
irqs.h IXP4xx: Introduce IXP4XX_GPIO_IRQ(n) macro and convert IXP4xx platform files. 2009-12-05 16:58:41 +01:00
ixp4xx-regs.h usb: gadget: pxa25x_udc: move register definitions from arch 2016-03-04 15:14:28 +02:00
ixp46x_ts.h ixp4xx_eth: Support the get_ts_info ethtool method. 2012-04-04 05:28:46 -04:00
npe.h IXP4xx: Ensure index is positive in irq_to_gpio() and npe_request(). 2009-12-05 16:58:38 +01:00
platform.h ARM: Show proper respect for Heinrich Hertz by using the correct unit for frequency 2015-05-14 16:22:05 +01:00
qmgr.h IXP4xx: use __iomem for MMIO 2012-11-22 03:36:45 +00:00
udc.h ARM: move udc_pxa2xx.h to linux/platform_data 2012-11-16 11:35:30 +00:00
uncompress.h ARM: remove unused arch_decomp_wdog() 2013-01-11 10:54:03 +08:00