From: balbi@kernel•org (Felipe Balbi)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 1/7] usb: gadget: pxa25x_udc: move register definitions from arch
Date: Wed, 17 Feb 2016 17:08:27 +0200 [thread overview]
Message-ID: <87oabfgys4.fsf@ti.com> (raw)
In-Reply-To: <1453997843-3489728-1-git-send-email-arnd@arndb.de>
Hi,
Arnd Bergmann <arnd@arndb•de> writes:
> 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.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb•de>
FYI, this series now sits in my testing/next. If you could just check
that I didn't mess anything up, I'd be glad.
Thanks
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160217/03af8ac6/attachment.sig>
next prev parent reply other threads:[~2016-02-17 15:08 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-28 16:15 [PATCH 0/7] USB changes for rare warnings Arnd Bergmann
2016-01-28 16:17 ` [PATCH 1/7] usb: gadget: pxa25x_udc: move register definitions from arch Arnd Bergmann
2016-01-28 16:17 ` [PATCH 2/7] usb: gadget: pxa25x_udc cleanup Arnd Bergmann
2016-01-29 10:13 ` Robert Jarzmik
2016-01-28 16:17 ` [PATCH 3/7] usb: gadget: pxa25x_udc: use readl/writel for mmio Arnd Bergmann
2016-01-29 10:17 ` Robert Jarzmik
2016-01-29 16:18 ` Krzysztof Hałasa
2016-01-29 17:06 ` Arnd Bergmann
2016-02-15 7:33 ` Krzysztof Hałasa
2016-02-15 9:33 ` Arnd Bergmann
2016-02-15 13:51 ` Krzysztof Hałasa
2016-02-15 16:12 ` Arnd Bergmann
2016-02-16 9:26 ` Krzysztof Hałasa
2016-02-16 11:26 ` Arnd Bergmann
2016-02-16 13:24 ` Krzysztof Hałasa
2016-02-16 13:55 ` Arnd Bergmann
2016-02-17 8:36 ` Krzysztof Hałasa
2016-02-17 10:36 ` Arnd Bergmann
2016-02-17 16:14 ` Krzysztof Hałasa
2016-02-20 20:54 ` Robert Jarzmik
2016-01-29 18:03 ` Sergei Shtylyov
2016-01-29 21:02 ` Arnd Bergmann
2016-01-29 9:32 ` [PATCH 1/7] usb: gadget: pxa25x_udc: move register definitions from arch Robert Jarzmik
2016-01-29 10:07 ` Arnd Bergmann
2016-01-29 15:26 ` Robert Jarzmik
2016-01-29 15:55 ` Krzysztof Hałasa
2016-02-17 15:08 ` Felipe Balbi [this message]
2016-02-17 16:00 ` Arnd Bergmann
2016-01-28 16:20 ` [PATCH 4/7] usb: fsl: drop USB_FSL_MPH_DR_OF Kconfig symbol Arnd Bergmann
2016-01-28 16:23 ` [PATCH 5/7] usb: isp1301-omap: mark power_up as __maybe_unused Arnd Bergmann
2016-01-28 16:23 ` [PATCH 6/7] usb: musb: use %pad format string from dma_addr_t Arnd Bergmann
2016-01-28 17:50 ` Tony Lindgren
2016-01-28 16:23 ` [PATCH 7/7] usb: musb/ux500: remove duplicate check for dma_is_compatible Arnd Bergmann
2016-02-03 18:12 ` [PATCH 0/7] USB changes for rare warnings Felipe Balbi
2016-02-03 19:15 ` Robert Jarzmik
2016-02-03 20:49 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87oabfgys4.fsf@ti.com \
--to=balbi@kernel$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox