| Message ID | 1334825735-27992-6-git-send-email-timo@exertus.fi |
|---|---|
| State | Accepted |
| Commit | 45b460dab3b47d03392ed46d42652103666503b7 |
| Delegated to: | Stefano Babic |
| Headers | show |
On 19/04/2012 10:55, Timo Ketola wrote: > The USB controller in i.MX25 has a PORTSCx registers which should be > set. In this regard it is similar to the controller in i.MX31. As this > file is compiled only with i.MX25 and -31, #ifdef check can be removed. > > Signed-off-by: Timo Ketola <timo@exertus.fi> > --- Acked-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
Dear Stefano Babic, > On 19/04/2012 10:55, Timo Ketola wrote: > > The USB controller in i.MX25 has a PORTSCx registers which should be > > set. In this regard it is similar to the controller in i.MX31. As this > > file is compiled only with i.MX25 and -31, #ifdef check can be removed. > > > > Signed-off-by: Timo Ketola <timo@exertus.fi> > > --- > > Acked-by: Stefano Babic <sbabic@denx.de> Stefano, will you apply these two USB patches please? > > Best regards, > Stefano Babic Best regards, Marek Vasut
On 19/04/2012 10:55, Timo Ketola wrote: > The USB controller in i.MX25 has a PORTSCx registers which should be > set. In this regard it is similar to the controller in i.MX31. As this > file is compiled only with i.MX25 and -31, #ifdef check can be removed. > > Signed-off-by: Timo Ketola <timo@exertus.fi> > --- > > Changes in v4: > - Reworded subject to shorten it > - Added commit message > - Changed the fix from adding i.MX25 to removing the check altogether > > Changes in v2: > - Dropped patches 2, 3 and 6 so this one changed from 8 to 5 > - Rebased to u-boot-imx next > > drivers/usb/host/ehci-mxc.c | 2 -- > 1 files changed, 0 insertions(+), 2 deletions(-) > Applied to u-boot-imx, thanks. Best regards, Stefano Babic
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c index 61dbccd..7384580 100644 --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c @@ -125,11 +125,9 @@ int ehci_hcd_init(void) hcor = (struct ehci_hcor *)((uint32_t) hccr + HC_LENGTH(ehci_readl(&hccr->cr_capbase))); setbits_le32(&ehci->usbmode, CM_HOST); -#ifdef CONFIG_MX31 setbits_le32(&ehci->control, USB_EN); __raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc); -#endif mxc_set_usbcontrol(CONFIG_MXC_USB_PORT, CONFIG_MXC_USB_FLAGS); udelay(10000);
The USB controller in i.MX25 has a PORTSCx registers which should be set. In this regard it is similar to the controller in i.MX31. As this file is compiled only with i.MX25 and -31, #ifdef check can be removed. Signed-off-by: Timo Ketola <timo@exertus.fi> --- Changes in v4: - Reworded subject to shorten it - Added commit message - Changed the fix from adding i.MX25 to removing the check altogether Changes in v2: - Dropped patches 2, 3 and 6 so this one changed from 8 to 5 - Rebased to u-boot-imx next drivers/usb/host/ehci-mxc.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)