diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-29 16:30:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-29 16:30:33 -0400 |
| commit | 0eb4cf9c14315e1976a116de75da6f420ac0e8dd (patch) | |
| tree | 3933d354a6be71cbe66d583fec3f5b2479e596ee /drivers/usb/eth/smsc95xx.c | |
| parent | 446d37c1acc76680770400fd90e6c502e49d72df (diff) | |
| parent | ac1d31380618f3f68bf7f05b73b6ab0cdeab0e9f (diff) | |
| download | u-boot-0eb4cf9c14315e1976a116de75da6f420ac0e8dd.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/usb/eth/smsc95xx.c')
| -rw-r--r-- | drivers/usb/eth/smsc95xx.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index d4b5ff465a..202e48285f 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -120,8 +120,9 @@ /* Some extra defines */ #define HS_USB_PKT_SIZE 512 #define FS_USB_PKT_SIZE 64 -#define DEFAULT_HS_BURST_CAP_SIZE (16 * 1024 + 5 * HS_USB_PKT_SIZE) -#define DEFAULT_FS_BURST_CAP_SIZE (6 * 1024 + 33 * FS_USB_PKT_SIZE) +/* 5/33 is lower limit for BURST_CAP to work */ +#define DEFAULT_HS_BURST_CAP_SIZE (5 * HS_USB_PKT_SIZE) +#define DEFAULT_FS_BURST_CAP_SIZE (33 * FS_USB_PKT_SIZE) #define DEFAULT_BULK_IN_DELAY 0x00002000 #define MAX_SINGLE_PACKET_SIZE 2048 #define EEPROM_MAC_OFFSET 0x01 @@ -135,7 +136,7 @@ #define USB_BULK_SEND_TIMEOUT 5000 #define USB_BULK_RECV_TIMEOUT 5000 -#define RX_URB_SIZE 2048 +#define RX_URB_SIZE DEFAULT_HS_BURST_CAP_SIZE #define PHY_CONNECT_TIMEOUT 5000 #define TURBO_MODE @@ -529,22 +530,6 @@ static int smsc95xx_init_common(struct usb_device *udev, struct ueth_data *dev, if (ret < 0) return ret; - ret = smsc95xx_read_reg(udev, HW_CFG, &read_buf); - if (ret < 0) - return ret; - debug("Read Value from HW_CFG : 0x%08x\n", read_buf); - - read_buf |= HW_CFG_BIR_; - ret = smsc95xx_write_reg(udev, HW_CFG, read_buf); - if (ret < 0) - return ret; - - ret = smsc95xx_read_reg(udev, HW_CFG, &read_buf); - if (ret < 0) - return ret; - debug("Read Value from HW_CFG after writing " - "HW_CFG_BIR_: 0x%08x\n", read_buf); - #ifdef TURBO_MODE if (dev->pusb_dev->speed == USB_SPEED_HIGH) { burst_cap = DEFAULT_HS_BURST_CAP_SIZE / HS_USB_PKT_SIZE; |