leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c5418a0b98
linux/arch/arm/mach-pxa
History
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
am200epd.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
am300epd.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
balloon3.c ARM: SoC multiplatform code changes for v4.5 2016-01-20 18:03:56 -08:00
capc7117.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
cm-x2xx-pci.c genirq: Remove irq argument from irq flow handlers 2015-09-16 15:47:51 +02:00
cm-x2xx-pci.h
cm-x2xx.c ARM: pxa: cm-x2xx: avoid duplicate macro warnings 2015-12-15 23:50:00 +01:00
cm-x255.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
cm-x270.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
cm-x300.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
colibri-evalboard.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
colibri-pxa3xx.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
colibri-pxa270-income.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
colibri-pxa270.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
colibri-pxa300.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
colibri-pxa320.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
colibri.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
corgi_pm.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
corgi.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
csb701.c
csb726.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
csb726.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
devices.c ARM: SoC multiplatform code changes for v4.5 2016-01-20 18:03:56 -08:00
devices.h ARM: pxa3xx: provide specific platform_devices for all ssp ports 2014-09-19 01:58:43 +08:00
em-x270.c ARM: SoC multiplatform code changes for v4.5 2016-01-20 18:03:56 -08:00
eseries-irq.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
eseries.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
ezx.c ARM: SoC multiplatform code changes for v4.5 2016-01-20 18:03:56 -08:00
generic.c ARM: pxa: Transition pxa25x, pxa27x, pxa3xx to clk framework 2015-05-12 23:26:46 +02:00
generic.h ARM: pxa: Transition pxa25x, pxa27x, pxa3xx to clk framework 2015-05-12 23:26:46 +02:00
gumstix.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
gumstix.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
h5000.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
h5000.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
himalaya.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
hx4700.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
icontrol.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
idp.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
idp.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
irq.c ARM: kill off set_irq_flags usage 2015-07-28 13:58:13 +02:00
Kconfig ARM: pxa: pxa_cplds: add lubbock and mainstone IO 2015-04-30 22:52:12 +02:00
littleton.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
littleton.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
lpd270.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
lpd270.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
lubbock.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
magician.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
mainstone.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
Makefile This is the pxa changes for v4.2 cycle. 2015-05-15 17:40:15 +02:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mfp-pxa2xx.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
mfp-pxa2xx.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
mfp-pxa3xx.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
mfp-pxa3xx.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
mfp-pxa25x.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
mfp-pxa27x.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
mfp-pxa300.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
mfp-pxa320.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
mfp-pxa930.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
mioa701_bootresume.S ARM: convert all "mov.* pc, reg" to "bx reg" for ARMv6+ 2014-07-18 12:29:04 +01:00
mioa701.c ARM: SoC multiplatform code changes for v4.5 2016-01-20 18:03:56 -08:00
mioa701.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
mp900.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
mxm8x10.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
mxm8x10.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
palm27x.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
palm27x.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
palmld.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
palmt5.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
palmt5.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
palmtc.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
palmte2.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
palmte2.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
palmtreo.c ARM: SoC multiplatform code changes for v4.5 2016-01-20 18:03:56 -08:00
palmtreo.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
palmtx.c ARM: SoC multiplatform code changes for v4.5 2016-01-20 18:03:56 -08:00
palmz72.c ARM: SoC multiplatform code changes for v4.5 2016-01-20 18:03:56 -08:00
palmz72.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pcm027.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pcm027.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pcm990_baseboard.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pcm990-baseboard.c ARM: SoC multiplatform code changes for v4.5 2016-01-20 18:03:56 -08:00
pm.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pm.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
poodle.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa2xx.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa3xx-ulpi.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa3xx.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa3xx.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa25x.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa25x.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa27x-udc.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa27x.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa27x.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa300.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa300.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa320.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa320.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa930.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa930.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
pxa_cplds_irqs.c ARM: pxa: pxa_cplds: signedness bug in probe 2015-05-22 16:41:20 +02:00
pxa-dt.c ARM: appropriate __init annotation for const data 2015-07-28 13:55:27 +02:00
raumfeld.c ARM: pxa: mark raumfeld init functions as __maybe_unused 2015-12-15 23:50:09 +01:00
regs-rtc.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
regs-u2d.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
reset.c ARM: pxa: prevent PXA270 occasional reboot freezes 2013-12-11 16:35:16 -08:00
saar.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
sharpsl_pm.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
sharpsl_pm.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
sleep.S ARM: pxa: correct errata number for PXA270 2014-07-04 20:30:42 +08:00
smemc.c ARM: PXA3xx: program the CSMSADRCFG register 2013-01-23 16:56:32 +08:00
spitz_pm.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
spitz.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
standby.S ARM: convert all "mov.* pc, reg" to "bx reg" for ARMv6+ 2014-07-18 12:29:04 +01:00
stargate2.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
tavorevb.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
tosa_bt.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
tosa-bt.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
tosa.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
trizeps4.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
udc.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
viper.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
viper.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
vpac270.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
xcep.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
z2.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
zeus.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
zeus.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
zylonite_pxa300.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
zylonite_pxa320.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
zylonite.c ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00
zylonite.h ARM: pxa: make more mach/*.h files local 2015-12-01 21:52:50 +01:00