Patchwork [U-Boot,v2,01/13] mx31: Move EHCI definitions to ehci-fsl.h

login
register
mail settings
Submitter Benoît Thébaudeau
Date Nov. 8, 2012, 8:27 p.m.
Message ID <1221800138.872097.1352406463706.JavaMail.root@advansee.com>
Download mbox | patch
Permalink /patch/197880/
State Changes Requested
Delegated to: Stefano Babic
Headers show

Comments

Benoît Thébaudeau - Nov. 8, 2012, 8:27 p.m.
The EHCI definitions in i.MX31's imx-regs.h are MXC-generic, so move them to
ehci-fsl.h so that all MXC SoCs can use them.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
---
Changes for v2: None.

 .../arch/arm/include/asm/arch-mx31/imx-regs.h      |   26 --------------------
 .../include/usb/ehci-fsl.h                         |   22 +++++++++++++++++
 2 files changed, 22 insertions(+), 26 deletions(-)
Stefano Babic - Nov. 10, 2012, 7:42 a.m.
On 08/11/2012 21:27, Benoît Thébaudeau wrote:
> The EHCI definitions in i.MX31's imx-regs.h are MXC-generic, so move them to
> ehci-fsl.h so that all MXC SoCs can use them.
> 
> Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> ---

Hi Benoît,

> Changes for v2: None.
> 
>  .../arch/arm/include/asm/arch-mx31/imx-regs.h      |   26 --------------------
>  .../include/usb/ehci-fsl.h                         |   22 +++++++++++++++++
>  2 files changed, 22 insertions(+), 26 deletions(-)
> 

By applying this patchset I see several minor issues reported by checkpatch:

WARNING: line over 80 characters
#303: FILE: drivers/usb/host/ehci-mx5.c:43:
+#define MXC_OTG_UCTRL_OWIE_BIT		(1 << 27)	/* OTG wakeup intr enable */

WARNING: line over 80 characters
#305: FILE: drivers/usb/host/ehci-mx5.c:45:
+#define MXC_H1_UCTRL_H1UIE_BIT		(1 << 12)	/* Host1 ULPI interrupt enable */

WARNING: line over 80 characters
#306: FILE: drivers/usb/host/ehci-mx5.c:46:
+#define MXC_H1_UCTRL_H1WIE_BIT		(1 << 11)	/* HOST1 wakeup intr enable */

WARNING: line over 80 characters
#312: FILE: drivers/usb/host/ehci-mx5.c:50:
+#define MXC_OTG_PHYCTRL_OC_DIS_BIT	(1 << 8)	/* OTG Disable Overcurrent
Event */

WARNING: line over 80 characters
#313: FILE: drivers/usb/host/ehci-mx5.c:51:
+#define MXC_H1_OC_DIS_BIT		(1 << 5)	/* UH1 Disable Overcurrent Event */

WARNING: line over 80 characters
#343: FILE: drivers/usb/host/ehci-mx5.c:174:
+			v &= ~MXC_H1_UCTRL_H1PM_BIT; /* HOST1 power mask unused */

WARNING: line over 80 characters
#352: FILE: drivers/usb/host/ehci-mx5.c:190:
+			v &= ~MXC_H2_UCTRL_H2PM_BIT; /* HOST2 power mask unused */

WARNING: line over 80 characters
#641: FILE: drivers/usb/host/ehci-mx5.c:47:
+#define MXC_OTG_UCTRL_O_PWR_POL_BIT	(1 << 24)	/* OTG power pin polarity */

WARNING: line over 80 characters
#645: FILE: drivers/usb/host/ehci-mx5.c:51:
+#define MXC_H1_UCTRL_H1_PWR_POL_BIT	(1 << 8)	/* HOST1 power pin polarity */

WARNING: line over 80 characters
#648: FILE: drivers/usb/host/ehci-mx5.c:54:
+#define MXC_OTG_PHYCTRL_OC_POL_BIT	(1 << 9)	/* OTG Polarity of
Overcurrent */

WARNING: line over 80 characters
#650: FILE: drivers/usb/host/ehci-mx5.c:56:
+#define MXC_H1_OC_POL_BIT		(1 << 6)	/* UH1 Polarity of Overcurrent */

WARNING: line over 80 characters
#652: FILE: drivers/usb/host/ehci-mx5.c:58:
+#define MXC_OTG_PHYCTRL_PWR_POL_BIT	(1 << 3)	/* OTG Power Pin Polarity */

WARNING: line over 80 characters
#873: FILE: drivers/usb/host/ehci-mxc.c:85:
+			MX25_H1_OCPOL_BIT | MX25_H1_TLL_BIT | MX25_H1_USBTE_BIT |

WARNING: line over 80 characters
#1078: FILE: drivers/usb/host/ehci-mxc.c:184:
+			MX35_H1_OCPOL_BIT | MX35_H1_TLL_BIT | MX35_H1_USBTE_BIT |

WARNING: line over 80 characters
#1179: FILE: board/freescale/mx35pdk/mx35pdk.c:105:
+	mxc_request_iomux(MX35_PIN_USBOTG_PWR, MUX_CONFIG_SION | MUX_CONFIG_FUNC);

WARNING: line over 80 characters
#1180: FILE: board/freescale/mx35pdk/mx35pdk.c:106:
+	mxc_request_iomux(MX35_PIN_USBOTG_OC, MUX_CONFIG_SION | MUX_CONFIG_FUNC);

total: 0 errors, 16 warnings, 810 lines checked

Can you fix them ? Thanks !

Best regards,
Stefano
Benoît Thébaudeau - Nov. 10, 2012, 12:37 p.m.
Hi Stefano,

On Saturday, November 10, 2012 8:42:24 AM, Stefano Babic wrote:
> On 08/11/2012 21:27, Benoît Thébaudeau wrote:
> > The EHCI definitions in i.MX31's imx-regs.h are MXC-generic, so
> > move them to
> > ehci-fsl.h so that all MXC SoCs can use them.
> > 
> > Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> > Cc: Marek Vasut <marex@denx.de>
> > Cc: Stefano Babic <sbabic@denx.de>
> > ---
> 
> Hi Benoît,
> 
> > Changes for v2: None.
> > 
> >  .../arch/arm/include/asm/arch-mx31/imx-regs.h      |   26
> >  --------------------
> >  .../include/usb/ehci-fsl.h                         |   22
> >  +++++++++++++++++
> >  2 files changed, 22 insertions(+), 26 deletions(-)
> > 
> 
> By applying this patchset I see several minor issues reported by
> checkpatch:
> 
> WARNING: line over 80 characters
> #303: FILE: drivers/usb/host/ehci-mx5.c:43:
> +#define MXC_OTG_UCTRL_OWIE_BIT		(1 << 27)	/* OTG wakeup intr enable
> */
> 
> WARNING: line over 80 characters
> #305: FILE: drivers/usb/host/ehci-mx5.c:45:
> +#define MXC_H1_UCTRL_H1UIE_BIT		(1 << 12)	/* Host1 ULPI interrupt
> enable */
> 
> WARNING: line over 80 characters
> #306: FILE: drivers/usb/host/ehci-mx5.c:46:
> +#define MXC_H1_UCTRL_H1WIE_BIT		(1 << 11)	/* HOST1 wakeup intr
> enable */
> 
> WARNING: line over 80 characters
> #312: FILE: drivers/usb/host/ehci-mx5.c:50:
> +#define MXC_OTG_PHYCTRL_OC_DIS_BIT	(1 << 8)	/* OTG Disable
> Overcurrent
> Event */
> 
> WARNING: line over 80 characters
> #313: FILE: drivers/usb/host/ehci-mx5.c:51:
> +#define MXC_H1_OC_DIS_BIT		(1 << 5)	/* UH1 Disable Overcurrent Event
> */
> 
> WARNING: line over 80 characters
> #343: FILE: drivers/usb/host/ehci-mx5.c:174:
> +			v &= ~MXC_H1_UCTRL_H1PM_BIT; /* HOST1 power mask unused */
> 
> WARNING: line over 80 characters
> #352: FILE: drivers/usb/host/ehci-mx5.c:190:
> +			v &= ~MXC_H2_UCTRL_H2PM_BIT; /* HOST2 power mask unused */
> 
> WARNING: line over 80 characters
> #641: FILE: drivers/usb/host/ehci-mx5.c:47:
> +#define MXC_OTG_UCTRL_O_PWR_POL_BIT	(1 << 24)	/* OTG power pin
> polarity */
> 
> WARNING: line over 80 characters
> #645: FILE: drivers/usb/host/ehci-mx5.c:51:
> +#define MXC_H1_UCTRL_H1_PWR_POL_BIT	(1 << 8)	/* HOST1 power pin
> polarity */
> 
> WARNING: line over 80 characters
> #648: FILE: drivers/usb/host/ehci-mx5.c:54:
> +#define MXC_OTG_PHYCTRL_OC_POL_BIT	(1 << 9)	/* OTG Polarity of
> Overcurrent */
> 
> WARNING: line over 80 characters
> #650: FILE: drivers/usb/host/ehci-mx5.c:56:
> +#define MXC_H1_OC_POL_BIT		(1 << 6)	/* UH1 Polarity of Overcurrent
> */
> 
> WARNING: line over 80 characters
> #652: FILE: drivers/usb/host/ehci-mx5.c:58:
> +#define MXC_OTG_PHYCTRL_PWR_POL_BIT	(1 << 3)	/* OTG Power Pin
> Polarity */
> 
> WARNING: line over 80 characters
> #873: FILE: drivers/usb/host/ehci-mxc.c:85:
> +			MX25_H1_OCPOL_BIT | MX25_H1_TLL_BIT | MX25_H1_USBTE_BIT |
> 
> WARNING: line over 80 characters
> #1078: FILE: drivers/usb/host/ehci-mxc.c:184:
> +			MX35_H1_OCPOL_BIT | MX35_H1_TLL_BIT | MX35_H1_USBTE_BIT |
> 
> WARNING: line over 80 characters
> #1179: FILE: board/freescale/mx35pdk/mx35pdk.c:105:
> +	mxc_request_iomux(MX35_PIN_USBOTG_PWR, MUX_CONFIG_SION |
> MUX_CONFIG_FUNC);
> 
> WARNING: line over 80 characters
> #1180: FILE: board/freescale/mx35pdk/mx35pdk.c:106:
> +	mxc_request_iomux(MX35_PIN_USBOTG_OC, MUX_CONFIG_SION |
> MUX_CONFIG_FUNC);
> 
> total: 0 errors, 16 warnings, 810 lines checked
> 
> Can you fix them ? Thanks !

OK, I'll do that. For the #define-s, do you prefer that I move the comment to
the previous line, or that I split the end of the comment to the next line?

Best regards,
Benoît
Albert ARIBAUD - Nov. 10, 2012, 12:46 p.m.
Hi Benoît,

On Sat, 10 Nov 2012 13:37:12 +0100 (CET), Benoît Thébaudeau
<benoit.thebaudeau@advansee.com> wrote:

> Hi Stefano,
> 
> On Saturday, November 10, 2012 8:42:24 AM, Stefano Babic wrote:
> > On 08/11/2012 21:27, Benoît Thébaudeau wrote:
> > > The EHCI definitions in i.MX31's imx-regs.h are MXC-generic, so
> > > move them to
> > > ehci-fsl.h so that all MXC SoCs can use them.
> > > 
> > > Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> > > Cc: Marek Vasut <marex@denx.de>
> > > Cc: Stefano Babic <sbabic@denx.de>
> > > ---
> > 
> > Hi Benoît,
> > 
> > > Changes for v2: None.
> > > 
> > >  .../arch/arm/include/asm/arch-mx31/imx-regs.h      |   26
> > >  --------------------
> > >  .../include/usb/ehci-fsl.h                         |   22
> > >  +++++++++++++++++
> > >  2 files changed, 22 insertions(+), 26 deletions(-)
> > > 
> > 
> > By applying this patchset I see several minor issues reported by
> > checkpatch:
> > 
> > WARNING: line over 80 characters
> > #303: FILE: drivers/usb/host/ehci-mx5.c:43:
> > +#define MXC_OTG_UCTRL_OWIE_BIT		(1 << 27)	/* OTG wakeup intr enable
> > */
> > 
> > WARNING: line over 80 characters
> > #305: FILE: drivers/usb/host/ehci-mx5.c:45:
> > +#define MXC_H1_UCTRL_H1UIE_BIT		(1 << 12)	/* Host1 ULPI interrupt
> > enable */
> > 
> > WARNING: line over 80 characters
> > #306: FILE: drivers/usb/host/ehci-mx5.c:46:
> > +#define MXC_H1_UCTRL_H1WIE_BIT		(1 << 11)	/* HOST1 wakeup intr
> > enable */
> > 
> > WARNING: line over 80 characters
> > #312: FILE: drivers/usb/host/ehci-mx5.c:50:
> > +#define MXC_OTG_PHYCTRL_OC_DIS_BIT	(1 << 8)	/* OTG Disable
> > Overcurrent
> > Event */
> > 
> > WARNING: line over 80 characters
> > #313: FILE: drivers/usb/host/ehci-mx5.c:51:
> > +#define MXC_H1_OC_DIS_BIT		(1 << 5)	/* UH1 Disable Overcurrent Event
> > */
> > 
> > WARNING: line over 80 characters
> > #343: FILE: drivers/usb/host/ehci-mx5.c:174:
> > +			v &= ~MXC_H1_UCTRL_H1PM_BIT; /* HOST1 power mask unused */
> > 
> > WARNING: line over 80 characters
> > #352: FILE: drivers/usb/host/ehci-mx5.c:190:
> > +			v &= ~MXC_H2_UCTRL_H2PM_BIT; /* HOST2 power mask unused */
> > 
> > WARNING: line over 80 characters
> > #641: FILE: drivers/usb/host/ehci-mx5.c:47:
> > +#define MXC_OTG_UCTRL_O_PWR_POL_BIT	(1 << 24)	/* OTG power pin
> > polarity */
> > 
> > WARNING: line over 80 characters
> > #645: FILE: drivers/usb/host/ehci-mx5.c:51:
> > +#define MXC_H1_UCTRL_H1_PWR_POL_BIT	(1 << 8)	/* HOST1 power pin
> > polarity */
> > 
> > WARNING: line over 80 characters
> > #648: FILE: drivers/usb/host/ehci-mx5.c:54:
> > +#define MXC_OTG_PHYCTRL_OC_POL_BIT	(1 << 9)	/* OTG Polarity of
> > Overcurrent */
> > 
> > WARNING: line over 80 characters
> > #650: FILE: drivers/usb/host/ehci-mx5.c:56:
> > +#define MXC_H1_OC_POL_BIT		(1 << 6)	/* UH1 Polarity of Overcurrent
> > */
> > 
> > WARNING: line over 80 characters
> > #652: FILE: drivers/usb/host/ehci-mx5.c:58:
> > +#define MXC_OTG_PHYCTRL_PWR_POL_BIT	(1 << 3)	/* OTG Power Pin
> > Polarity */
> > 
> > WARNING: line over 80 characters
> > #873: FILE: drivers/usb/host/ehci-mxc.c:85:
> > +			MX25_H1_OCPOL_BIT | MX25_H1_TLL_BIT | MX25_H1_USBTE_BIT |
> > 
> > WARNING: line over 80 characters
> > #1078: FILE: drivers/usb/host/ehci-mxc.c:184:
> > +			MX35_H1_OCPOL_BIT | MX35_H1_TLL_BIT | MX35_H1_USBTE_BIT |
> > 
> > WARNING: line over 80 characters
> > #1179: FILE: board/freescale/mx35pdk/mx35pdk.c:105:
> > +	mxc_request_iomux(MX35_PIN_USBOTG_PWR, MUX_CONFIG_SION |
> > MUX_CONFIG_FUNC);
> > 
> > WARNING: line over 80 characters
> > #1180: FILE: board/freescale/mx35pdk/mx35pdk.c:106:
> > +	mxc_request_iomux(MX35_PIN_USBOTG_OC, MUX_CONFIG_SION |
> > MUX_CONFIG_FUNC);
> > 
> > total: 0 errors, 16 warnings, 810 lines checked
> > 
> > Can you fix them ? Thanks !
> 
> OK, I'll do that. For the #define-s, do you prefer that I move the comment to
> the previous line, or that I split the end of the comment to the next line?

I'll let Stefano give a definitive answer of course, but I personally
prefer that comments be moved before the defines.

> Best regards,
> Benoît

Amicalement,
Albert ARIBAUD - Nov. 10, 2012, 12:47 p.m.
> I'll let Stefano give a definitive answer of course, but I personally
> prefer that comments be moved before the defines.

Note: I mean that each comment should precede its corresponding define,
of course; I don't want all these comments lumped together in a single
block.

Amicalement,
Benoît Thébaudeau - Nov. 10, 2012, 1:51 p.m.
On Saturday, November 10, 2012 1:47:51 PM, Albert ARIBAUD wrote:
> > I'll let Stefano give a definitive answer of course, but I
> > personally
> > prefer that comments be moved before the defines.
> 
> Note: I mean that each comment should precede its corresponding
> define,
> of course; I don't want all these comments lumped together in a
> single
> block.

Sure. And if some comments fit at the end of the line, but not all, do you
prefer to also move these fitting comments to the previous line for more
consistency?

Cordialement,
Benoît
Stefano Babic - Nov. 10, 2012, 4:45 p.m.
Am 10/11/2012 13:37, schrieb Benoît Thébaudeau:
> Hi Stefano,
> 
> On Saturday, November 10, 2012 8:42:24 AM, Stefano Babic wrote:
>> On 08/11/2012 21:27, Benoît Thébaudeau wrote:
>>> The EHCI definitions in i.MX31's imx-regs.h are MXC-generic, so
>>> move them to
>>> ehci-fsl.h so that all MXC SoCs can use them.
>>>
>>> Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
>>> Cc: Marek Vasut <marex@denx.de>
>>> Cc: Stefano Babic <sbabic@denx.de>
>>> ---
>>
>> Hi Benoît,
>>
>>> Changes for v2: None.
>>>
>>>  .../arch/arm/include/asm/arch-mx31/imx-regs.h      |   26
>>>  --------------------
>>>  .../include/usb/ehci-fsl.h                         |   22
>>>  +++++++++++++++++
>>>  2 files changed, 22 insertions(+), 26 deletions(-)
>>>
>>
>> By applying this patchset I see several minor issues reported by
>> checkpatch:
>>
>> WARNING: line over 80 characters
>> #303: FILE: drivers/usb/host/ehci-mx5.c:43:
>> +#define MXC_OTG_UCTRL_OWIE_BIT		(1 << 27)	/* OTG wakeup intr enable
>> */
>>
>> WARNING: line over 80 characters
>> #305: FILE: drivers/usb/host/ehci-mx5.c:45:
>> +#define MXC_H1_UCTRL_H1UIE_BIT		(1 << 12)	/* Host1 ULPI interrupt
>> enable */
>>
>> WARNING: line over 80 characters
>> #306: FILE: drivers/usb/host/ehci-mx5.c:46:
>> +#define MXC_H1_UCTRL_H1WIE_BIT		(1 << 11)	/* HOST1 wakeup intr
>> enable */
>>
>> WARNING: line over 80 characters
>> #312: FILE: drivers/usb/host/ehci-mx5.c:50:
>> +#define MXC_OTG_PHYCTRL_OC_DIS_BIT	(1 << 8)	/* OTG Disable
>> Overcurrent
>> Event */
>>
>> WARNING: line over 80 characters
>> #313: FILE: drivers/usb/host/ehci-mx5.c:51:
>> +#define MXC_H1_OC_DIS_BIT		(1 << 5)	/* UH1 Disable Overcurrent Event
>> */
>>
>> WARNING: line over 80 characters
>> #343: FILE: drivers/usb/host/ehci-mx5.c:174:
>> +			v &= ~MXC_H1_UCTRL_H1PM_BIT; /* HOST1 power mask unused */
>>
>> WARNING: line over 80 characters
>> #352: FILE: drivers/usb/host/ehci-mx5.c:190:
>> +			v &= ~MXC_H2_UCTRL_H2PM_BIT; /* HOST2 power mask unused */
>>
>> WARNING: line over 80 characters
>> #641: FILE: drivers/usb/host/ehci-mx5.c:47:
>> +#define MXC_OTG_UCTRL_O_PWR_POL_BIT	(1 << 24)	/* OTG power pin
>> polarity */
>>
>> WARNING: line over 80 characters
>> #645: FILE: drivers/usb/host/ehci-mx5.c:51:
>> +#define MXC_H1_UCTRL_H1_PWR_POL_BIT	(1 << 8)	/* HOST1 power pin
>> polarity */
>>
>> WARNING: line over 80 characters
>> #648: FILE: drivers/usb/host/ehci-mx5.c:54:
>> +#define MXC_OTG_PHYCTRL_OC_POL_BIT	(1 << 9)	/* OTG Polarity of
>> Overcurrent */
>>
>> WARNING: line over 80 characters
>> #650: FILE: drivers/usb/host/ehci-mx5.c:56:
>> +#define MXC_H1_OC_POL_BIT		(1 << 6)	/* UH1 Polarity of Overcurrent
>> */
>>
>> WARNING: line over 80 characters
>> #652: FILE: drivers/usb/host/ehci-mx5.c:58:
>> +#define MXC_OTG_PHYCTRL_PWR_POL_BIT	(1 << 3)	/* OTG Power Pin
>> Polarity */
>>
>> WARNING: line over 80 characters
>> #873: FILE: drivers/usb/host/ehci-mxc.c:85:
>> +			MX25_H1_OCPOL_BIT | MX25_H1_TLL_BIT | MX25_H1_USBTE_BIT |
>>
>> WARNING: line over 80 characters
>> #1078: FILE: drivers/usb/host/ehci-mxc.c:184:
>> +			MX35_H1_OCPOL_BIT | MX35_H1_TLL_BIT | MX35_H1_USBTE_BIT |
>>
>> WARNING: line over 80 characters
>> #1179: FILE: board/freescale/mx35pdk/mx35pdk.c:105:
>> +	mxc_request_iomux(MX35_PIN_USBOTG_PWR, MUX_CONFIG_SION |
>> MUX_CONFIG_FUNC);
>>
>> WARNING: line over 80 characters
>> #1180: FILE: board/freescale/mx35pdk/mx35pdk.c:106:
>> +	mxc_request_iomux(MX35_PIN_USBOTG_OC, MUX_CONFIG_SION |
>> MUX_CONFIG_FUNC);
>>
>> total: 0 errors, 16 warnings, 810 lines checked
>>
>> Can you fix them ? Thanks !
> 
> OK, I'll do that. For the #define-s, do you prefer that I move the comment to
> the previous line, or that I split the end of the comment to the next line?

I have no preference, I usually move the comment to the previous line,
but it is a question of taste ;-)

Stefano

Patch

diff --git u-boot-usb-76454b2.orig/arch/arm/include/asm/arch-mx31/imx-regs.h u-boot-usb-76454b2/arch/arm/include/asm/arch-mx31/imx-regs.h
index 8fd3d08..01a849d 100644
--- u-boot-usb-76454b2.orig/arch/arm/include/asm/arch-mx31/imx-regs.h
+++ u-boot-usb-76454b2/arch/arm/include/asm/arch-mx31/imx-regs.h
@@ -896,32 +896,6 @@  struct esdc_regs {
 #define MX31_AIPS1_BASE_ADDR	0x43f00000
 #define IMX_USB_BASE		(MX31_AIPS1_BASE_ADDR + 0x88000)
 
-/* USB portsc */
-/* values for portsc field */
-#define MXC_EHCI_PHY_LOW_POWER_SUSPEND	(1 << 23)
-#define MXC_EHCI_FORCE_FS		(1 << 24)
-#define MXC_EHCI_UTMI_8BIT		(0 << 28)
-#define MXC_EHCI_UTMI_16BIT		(1 << 28)
-#define MXC_EHCI_SERIAL			(1 << 29)
-#define MXC_EHCI_MODE_UTMI		(0 << 30)
-#define MXC_EHCI_MODE_PHILIPS		(1 << 30)
-#define MXC_EHCI_MODE_ULPI		(2 << 30)
-#define MXC_EHCI_MODE_SERIAL		(3 << 30)
-
-/* values for flags field */
-#define MXC_EHCI_INTERFACE_DIFF_UNI	(0 << 0)
-#define MXC_EHCI_INTERFACE_DIFF_BI	(1 << 0)
-#define MXC_EHCI_INTERFACE_SINGLE_UNI	(2 << 0)
-#define MXC_EHCI_INTERFACE_SINGLE_BI	(3 << 0)
-#define MXC_EHCI_INTERFACE_MASK		(0xf)
-
-#define MXC_EHCI_POWER_PINS_ENABLED	(1 << 5)
-#define MXC_EHCI_TTL_ENABLED		(1 << 6)
-
-#define MXC_EHCI_INTERNAL_PHY		(1 << 7)
-#define MXC_EHCI_IPPUE_DOWN		(1 << 8)
-#define MXC_EHCI_IPPUE_UP		(1 << 9)
-
 /*
  * CSPI register definitions
  */
diff --git u-boot-usb-76454b2.orig/include/usb/ehci-fsl.h u-boot-usb-76454b2/include/usb/ehci-fsl.h
index 2869302..4dee5b0 100644
--- u-boot-usb-76454b2.orig/include/usb/ehci-fsl.h
+++ u-boot-usb-76454b2/include/usb/ehci-fsl.h
@@ -246,9 +246,31 @@  struct usb_ehci {
 /*
  * For MXC SOCs
  */
+
+/* values for portsc field */
+#define MXC_EHCI_PHY_LOW_POWER_SUSPEND	(1 << 23)
+#define MXC_EHCI_FORCE_FS		(1 << 24)
+#define MXC_EHCI_UTMI_8BIT		(0 << 28)
+#define MXC_EHCI_UTMI_16BIT		(1 << 28)
+#define MXC_EHCI_SERIAL			(1 << 29)
+#define MXC_EHCI_MODE_UTMI		(0 << 30)
+#define MXC_EHCI_MODE_PHILIPS		(1 << 30)
+#define MXC_EHCI_MODE_ULPI		(2 << 30)
+#define MXC_EHCI_MODE_SERIAL		(3 << 30)
+
+/* values for flags field */
+#define MXC_EHCI_INTERFACE_DIFF_UNI	(0 << 0)
+#define MXC_EHCI_INTERFACE_DIFF_BI	(1 << 0)
+#define MXC_EHCI_INTERFACE_SINGLE_UNI	(2 << 0)
+#define MXC_EHCI_INTERFACE_SINGLE_BI	(3 << 0)
+#define MXC_EHCI_INTERFACE_MASK		(0xf)
+
 #define MXC_EHCI_POWER_PINS_ENABLED	(1 << 5)
 #define MXC_EHCI_TTL_ENABLED		(1 << 6)
+
 #define MXC_EHCI_INTERNAL_PHY		(1 << 7)
+#define MXC_EHCI_IPPUE_DOWN		(1 << 8)
+#define MXC_EHCI_IPPUE_UP		(1 << 9)
 
 /* Board-specific initialization */
 int board_ehci_hcd_init(int port);