From mboxrd@z Thu Jan 1 00:00:00 1970 From: marex@denx.de (Marek Vasut) Date: Wed, 16 May 2012 03:02:40 +0200 Subject: [PATCH 3/8] MXS: Fixup i.MX233 USB base address name In-Reply-To: <20120516005826.GH29393@b20223-02.ap.freescale.net> References: <1337070219-3630-1-git-send-email-marex@denx.de> <1337070219-3630-4-git-send-email-marex@denx.de> <20120516005826.GH29393@b20223-02.ap.freescale.net> Message-ID: <201205160302.41206.marex@denx.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Dear Richard Zhao, > On Tue, May 15, 2012 at 10:23:34AM +0200, Marek Vasut wrote: > > Modify USB EHCI and USB PHY base addresses on the i.MX233 to nicely fit > > into the whole USB registration scheme. > > > > Based on code by: > > Tony Lin > > > > Signed-off-by: Marek Vasut > > Cc: Chen Peter-B29397 > > Cc: Detlev Zundel > > Cc: Fabio Estevam > > Cc: Li Frank-B20596 > > Cc: Linux USB > > Cc: Liu JunJie-B08287 > > Cc: Sascha Hauer > > Cc: Shawn Guo > > Cc: Shi Make-B15407 > > Cc: Stefano Babic > > Cc: Subodh Nijsure > > Cc: Wolfgang Denk > > --- > > > > arch/arm/mach-mxs/include/mach/mx23.h | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/arch/arm/mach-mxs/include/mach/mx23.h > > b/arch/arm/mach-mxs/include/mach/mx23.h index 599094b..7955b75 100644 > > --- a/arch/arm/mach-mxs/include/mach/mx23.h > > +++ b/arch/arm/mach-mxs/include/mach/mx23.h > > @@ -64,8 +64,8 @@ > > > > #define MX23_AUART1_BASE_ADDR (MX23_IO_BASE_ADDR + 0x06c000) > > #define MX23_AUART2_BASE_ADDR (MX23_IO_BASE_ADDR + 0x06e000) > > #define MX23_DUART_BASE_ADDR (MX23_IO_BASE_ADDR + 0x070000) > > > > -#define MX23_USBPHY_BASE_ADDR (MX23_IO_BASE_ADDR + 0x07c000) > > -#define MX23_USBCTRL_BASE_ADDR (MX23_IO_BASE_ADDR + 0x080000) > > +#define MX23_USBPHY0_BASE_ADDR (MX23_IO_BASE_ADDR + 0x07c000) > > +#define MX23_USBCTRL0_BASE_ADDR (MX23_IO_BASE_ADDR + 0x080000) > > Why not migrate to DT? When it's mainline, sure ... right now, I wanted to make sure these patches can be tested without much problems. > > Thanks > Richard > > > #define MX23_DRAM_BASE_ADDR (MX23_IO_BASE_ADDR + 0x0e0000) > > > > #define MX23_IO_P2V(x) MXS_IO_P2V(x) > > > > @@ -89,8 +89,8 @@ > > > > #define MX23_INT_SPDIF_ERROR 10 > > #define MX23_INT_SAIF1_IRQ 10 > > #define MX23_INT_SAIF2_IRQ 10 > > > > -#define MX23_INT_USB_CTRL 11 > > -#define MX23_INT_USB_WAKEUP 12 > > +#define MX23_INT_USB0 11 > > +#define MX23_INT_USB0_WAKEUP 12 > > > > #define MX23_INT_GPMI_DMA 13 > > #define MX23_INT_SSP1_DMA 14 > > #define MX23_INT_SSP1_ERROR 15 Best regards, Marek Vasut