From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423772AbcBQPIf (ORCPT ); Wed, 17 Feb 2016 10:08:35 -0500 Received: from mail-lb0-f176.google.com ([209.85.217.176]:36528 "EHLO mail-lb0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423755AbcBQPId (ORCPT ); Wed, 17 Feb 2016 10:08:33 -0500 From: Felipe Balbi To: Arnd Bergmann , Imre Kaloz , Krzysztof Halasa , Russell King , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Felipe Balbi , Greg Kroah-Hartman Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/7] usb: gadget: pxa25x_udc: move register definitions from arch In-Reply-To: <1453997843-3489728-1-git-send-email-arnd@arndb.de> References: <1453997722-3489596-1-git-send-email-arnd@arndb.de> <1453997843-3489728-1-git-send-email-arnd@arndb.de> User-Agent: Notmuch/0.21 (http://notmuchmail.org) Emacs/25.0.50.1 (x86_64-pc-linux-gnu) Date: Wed, 17 Feb 2016 17:08:27 +0200 Message-ID: <87oabfgys4.fsf@ti.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi, Arnd Bergmann 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 t= he 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 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 =2D-=20 balbi --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWxIzrAAoJEIaOsuA1yqRE35AP/0M/S79/Dw/5GZ0FAjSp4qmC SNRqF3mu7GEhQBRrJpw5PQ+JltAuK51GGZ71k7/Ov+U3fAz7pv5yj0egJ9k/loPP yq2QLSNsmgPLN44hafhZa7ybJnBw1pwMI3JSzYDFaDa6XAROPYQG3YX3bOaxMg3j Hn0p7bESCkbElaxgWds2AY93ZfCWrqbdEhjMgMGlLDTIE+hcVCBbajKyaDNMgVUv XD9BCGWJnoe6mbA/1DPFnjEWb+hx09cTA7Dte2hyV9XwCsnpdZMbT+kWy930EdM8 hPJM8byWaVBE3TowUG3k32Hff1Y5aIQPWFNOltJjvV4kHuFyMTS9tZfnGKD6W+ik j4l7LvhLJdydERupcFDvoEf4I9jY4rf5W1lDNyFRW80PtO0YPilc9TXPpDC6njr0 miwdR0zPAk/n3Brj+LXLAJbcqztFpUJHGy4A24QC/WhTceYLuU1M3Uo0b888Ch3v 2LqnM4TfiX7RglrcmNnDpRblBYhhEZx/r3x3/5Er9PxiTH1dMIjayxnBC1815W78 P2SOn+YoOjM/pViGo+YlOkkAZFckDB7touCAU3s+arELg6+8OxEOvITvh/Jqm/Wh i0JBm4Gky0Zr6nh8CwaQ0N+PW5FxBzhs/7gOBTxiToOFnUgUz4XFl61vmt09jm4h UcCoFR1l1Ru5vjgqNb4N =x15E -----END PGP SIGNATURE----- --=-=-=--