diff options
| author | Tobias Diedrich <ranma+coreboot@tdiedrich.de> | 2010-06-22 13:58:34 +0000 |
|---|---|---|
| committer | Tobias Diedrich <ranma+coreboot@tdiedrich.de> | 2010-06-22 13:58:34 +0000 |
| commit | 826508029baeb83d6cefdec94f47b5dc0c66ae11 (patch) | |
| tree | 39ca0beaec0f2c6b98cc2956bfe88d96347c2292 | |
| parent | 7ce6802b4871338e270c1067af0b175a8bcb8c14 (diff) | |
| download | rockbox-826508029baeb83d6cefdec94f47b5dc0c66ae11.zip rockbox-826508029baeb83d6cefdec94f47b5dc0c66ae11.tar.gz rockbox-826508029baeb83d6cefdec94f47b5dc0c66ae11.tar.bz2 rockbox-826508029baeb83d6cefdec94f47b5dc0c66ae11.tar.xz | |
Unconditionally boost cpu and remove CNAK retry panic
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27054 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/target/arm/as3525/usb-drv-as3525.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/firmware/target/arm/as3525/usb-drv-as3525.c b/firmware/target/arm/as3525/usb-drv-as3525.c index b2f57ec..90a1c93 100644 --- a/firmware/target/arm/as3525/usb-drv-as3525.c +++ b/firmware/target/arm/as3525/usb-drv-as3525.c @@ -227,6 +227,9 @@ void usb_drv_init(void) usb_enable_pll(); + /* we have external power, so boost cpu */ + cpu_boost(1); + /* length regulator: normal operation */ ascodec_write(AS3514_CVDD_DCDC3, ascodec_read(AS3514_CVDD_DCDC3) | 1<<2); @@ -316,6 +319,7 @@ void usb_drv_exit(void) /* Disable UVDD generating LDO */ ascodec_write(AS3515_USB_UTIL, ascodec_read(AS3515_USB_UTIL) & ~(1<<4)); usb_disable_pll(); + cpu_boost(0); logf("usb_drv_exit() !!!!\n"); } @@ -439,13 +443,11 @@ int usb_drv_recv(int ep, void *ptr, int len) if (USB_OEP_CTRL(ep) & USB_EP_CTRL_NAK) { int i = 0; - logf("CNAK fail? CTRL=%x\n", (int)USB_OEP_CTRL(ep)); while (USB_OEP_CTRL(ep) & USB_EP_CTRL_NAK) { USB_OEP_CTRL(ep) |= USB_EP_CTRL_CNAK; /* Go! */ i++; } - if (i>2) - panicf("ep%d CNAK needed %d retries CTRL=%x", ep, i, (int)USB_OEP_CTRL(ep)); + logf("ep%d CNAK needed %d retries CTRL=%x\n", ep, i, (int)USB_OEP_CTRL(ep)); } return 0; |