Patchwork [3/8] MXS: Fixup i.MX233 USB base address name

login
register
mail settings
Submitter Marek Vasut
Date May 15, 2012, 8:23 a.m.
Message ID <1337070219-3630-4-git-send-email-marex@denx.de>
Download mbox | patch
Permalink /patch/159252/
State New
Headers show

Comments

Marek Vasut - May 15, 2012, 8:23 a.m.
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 <tony.lin@freescale.com>

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chen Peter-B29397 <B29397@freescale.com>
Cc: Detlev Zundel <dzu@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Li Frank-B20596 <B20596@freescale.com>
Cc: Linux USB <linux-usb@vger.kernel.org>
Cc: Liu JunJie-B08287 <B08287@freescale.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Shi Make-B15407 <B15407@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Subodh Nijsure <snijsure@grid-net.com>
Cc: Wolfgang Denk <wd@denx.de>
---
 arch/arm/mach-mxs/include/mach/mx23.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Richard Zhao - May 16, 2012, 12:58 a.m.
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 <tony.lin@freescale.com>
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Chen Peter-B29397 <B29397@freescale.com>
> Cc: Detlev Zundel <dzu@denx.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> Cc: Li Frank-B20596 <B20596@freescale.com>
> Cc: Linux USB <linux-usb@vger.kernel.org>
> Cc: Liu JunJie-B08287 <B08287@freescale.com>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> Cc: Shi Make-B15407 <B15407@freescale.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Subodh Nijsure <snijsure@grid-net.com>
> Cc: Wolfgang Denk <wd@denx.de>
> ---
>  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?

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
> -- 
> 1.7.10
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
Marek Vasut - May 16, 2012, 1:02 a.m.
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 <tony.lin@freescale.com>
> > 
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Chen Peter-B29397 <B29397@freescale.com>
> > Cc: Detlev Zundel <dzu@denx.de>
> > Cc: Fabio Estevam <festevam@gmail.com>
> > Cc: Li Frank-B20596 <B20596@freescale.com>
> > Cc: Linux USB <linux-usb@vger.kernel.org>
> > Cc: Liu JunJie-B08287 <B08287@freescale.com>
> > Cc: Sascha Hauer <s.hauer@pengutronix.de>
> > Cc: Shawn Guo <shawn.guo@linaro.org>
> > Cc: Shi Make-B15407 <B15407@freescale.com>
> > Cc: Stefano Babic <sbabic@denx.de>
> > Cc: Subodh Nijsure <snijsure@grid-net.com>
> > Cc: Wolfgang Denk <wd@denx.de>
> > ---
> > 
> >  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

Patch

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)
 #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