USB support

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

12 files changed, 1881 insertions, 579 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6a9190c8e2..c080eedbab 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -66,5 +66,7 @@ config DRIVER_NET_TAP
 	bool "tap Ethernet driver"
 	depends on LINUX
 
+source "drivers/net/usb/Kconfig"
+
 endmenu
 
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 091bd241bb..a5895c36dd 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -8,3 +8,4 @@ obj-$(CONFIG_DRIVER_NET_FEC_IMX)	+= fec_imx.o
 obj-$(CONFIG_DRIVER_NET_MACB)		+= macb.o
 obj-$(CONFIG_DRIVER_NET_TAP)		+= tap.o
 obj-$(CONFIG_MIIPHY)			+= miiphy.o
+obj-$(CONFIG_NET_USB)			+= usb/
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
new file mode 100644
index 0000000000..d0e01f3c83
--- /dev/null
+++ b/drivers/net/usb/Kconfig
@@ -0,0 +1,10 @@
+menuconfig NET_USB
+	depends on USB
+	bool "USB network support"
+
+if NET_USB
+
+config NET_USB_ASIX
+	bool "Asix compatible"
+
+endif
diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile
new file mode 100644
index 0000000000..555f8c2f1f
--- /dev/null
+++ b/drivers/net/usb/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_NET_USB)			+= usbnet.o
+obj-$(CONFIG_NET_USB_ASIX)		+= asix.o
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
new file mode 100644
index 0000000000..b5acb0c2ac
--- /dev/null
+++ b/drivers/net/usb/asix.c
@@ -0,0 +1,786 @@
+#include <common.h>
+#include <init.h>
+#include <net.h>
+#include <miiphy.h>
+#include <usb/usb.h>
+#include <usb/usbnet.h>
+#include <errno.h>
+#include <malloc.h>
+#include <asm/byteorder.h>
+
+/* ASIX AX8817X based USB 2.0 Ethernet Devices */
+
+#define AX_CMD_SET_SW_MII		0x06
+#define AX_CMD_READ_MII_REG		0x07
+#define AX_CMD_WRITE_MII_REG		0x08
+#define AX_CMD_SET_HW_MII		0x0a
+#define AX_CMD_READ_EEPROM		0x0b
+#define AX_CMD_WRITE_EEPROM		0x0c
+#define AX_CMD_WRITE_ENABLE		0x0d
+#define AX_CMD_WRITE_DISABLE		0x0e
+#define AX_CMD_READ_RX_CTL		0x0f
+#define AX_CMD_WRITE_RX_CTL		0x10
+#define AX_CMD_READ_IPG012		0x11
+#define AX_CMD_WRITE_IPG0		0x12
+#define AX_CMD_WRITE_IPG1		0x13
+#define AX_CMD_READ_NODE_ID		0x13
+#define AX_CMD_WRITE_IPG2		0x14
+#define AX_CMD_WRITE_MULTI_FILTER	0x16
+#define AX88172_CMD_READ_NODE_ID	0x17
+#define AX_CMD_READ_PHY_ID		0x19
+#define AX_CMD_READ_MEDIUM_STATUS	0x1a
+#define AX_CMD_WRITE_MEDIUM_MODE	0x1b
+#define AX_CMD_READ_MONITOR_MODE	0x1c
+#define AX_CMD_WRITE_MONITOR_MODE	0x1d
+#define AX_CMD_READ_GPIOS		0x1e
+#define AX_CMD_WRITE_GPIOS		0x1f
+#define AX_CMD_SW_RESET			0x20
+#define AX_CMD_SW_PHY_STATUS		0x21
+#define AX_CMD_SW_PHY_SELECT		0x22
+
+#define AX_MONITOR_MODE			0x01
+#define AX_MONITOR_LINK			0x02
+#define AX_MONITOR_MAGIC		0x04
+#define AX_MONITOR_HSFS			0x10
+
+/* AX88172 Medium Status Register values */
+#define AX88172_MEDIUM_FD		0x02
+#define AX88172_MEDIUM_TX		0x04
+#define AX88172_MEDIUM_FC		0x10
+#define AX88172_MEDIUM_DEFAULT \
+		( AX88172_MEDIUM_FD | AX88172_MEDIUM_TX | AX88172_MEDIUM_FC )
+
+#define AX_MCAST_FILTER_SIZE		8
+#define AX_MAX_MCAST			64
+
+#define AX_SWRESET_CLEAR		0x00
+#define AX_SWRESET_RR			0x01
+#define AX_SWRESET_RT			0x02
+#define AX_SWRESET_PRTE			0x04
+#define AX_SWRESET_PRL			0x08
+#define AX_SWRESET_BZ			0x10
+#define AX_SWRESET_IPRL			0x20
+#define AX_SWRESET_IPPD			0x40
+
+#define AX88772_IPG0_DEFAULT		0x15
+#define AX88772_IPG1_DEFAULT		0x0c
+#define AX88772_IPG2_DEFAULT		0x12
+
+/* AX88772 & AX88178 Medium Mode Register */
+#define AX_MEDIUM_PF		0x0080
+#define AX_MEDIUM_JFE		0x0040
+#define AX_MEDIUM_TFC		0x0020
+#define AX_MEDIUM_RFC		0x0010
+#define AX_MEDIUM_ENCK		0x0008
+#define AX_MEDIUM_AC		0x0004
+#define AX_MEDIUM_FD		0x0002
+#define AX_MEDIUM_GM		0x0001
+#define AX_MEDIUM_SM		0x1000
+#define AX_MEDIUM_SBP		0x0800
+#define AX_MEDIUM_PS		0x0200
+#define AX_MEDIUM_RE		0x0100
+
+#define AX88178_MEDIUM_DEFAULT	\
+	(AX_MEDIUM_PS | AX_MEDIUM_FD | AX_MEDIUM_AC | \
+	 AX_MEDIUM_RFC | AX_MEDIUM_TFC | AX_MEDIUM_JFE | \
+	 AX_MEDIUM_RE )
+
+#define AX88772_MEDIUM_DEFAULT	\
+	(AX_MEDIUM_FD | AX_MEDIUM_RFC | \
+	 AX_MEDIUM_TFC | AX_MEDIUM_PS | \
+	 AX_MEDIUM_AC | AX_MEDIUM_RE )
+
+/* AX88772 & AX88178 RX_CTL values */
+#define AX_RX_CTL_SO			0x0080
+#define AX_RX_CTL_AP			0x0020
+#define AX_RX_CTL_AM			0x0010
+#define AX_RX_CTL_AB			0x0008
+#define AX_RX_CTL_SEP			0x0004
+#define AX_RX_CTL_AMALL			0x0002
+#define AX_RX_CTL_PRO			0x0001
+#define AX_RX_CTL_MFB_2048		0x0000
+#define AX_RX_CTL_MFB_4096		0x0100
+#define AX_RX_CTL_MFB_8192		0x0200
+#define AX_RX_CTL_MFB_16384		0x0300
+
+#define AX_DEFAULT_RX_CTL	\
+	(AX_RX_CTL_SO | AX_RX_CTL_AB )
+
+/* GPIO 0 .. 2 toggles */
+#define AX_GPIO_GPO0EN		0x01	/* GPIO0 Output enable */
+#define AX_GPIO_GPO_0		0x02	/* GPIO0 Output value */
+#define AX_GPIO_GPO1EN		0x04	/* GPIO1 Output enable */
+#define AX_GPIO_GPO_1		0x08	/* GPIO1 Output value */
+#define AX_GPIO_GPO2EN		0x10	/* GPIO2 Output enable */
+#define AX_GPIO_GPO_2		0x20	/* GPIO2 Output value */
+#define AX_GPIO_RESERVED	0x40	/* Reserved */
+#define AX_GPIO_RSE		0x80	/* Reload serial EEPROM */
+
+#define AX_EEPROM_MAGIC		0xdeadbeef
+#define AX88172_EEPROM_LEN	0x40
+#define AX88772_EEPROM_LEN	0xff
+
+#define PHY_MODE_MARVELL	0x0000
+#define MII_MARVELL_LED_CTRL	0x0018
+#define MII_MARVELL_STATUS	0x001b
+#define MII_MARVELL_CTRL	0x0014
+
+#define MARVELL_LED_MANUAL	0x0019
+
+#define MARVELL_STATUS_HWCFG	0x0004
+
+#define MARVELL_CTRL_TXDELAY	0x0002
+#define MARVELL_CTRL_RXDELAY	0x0080
+
+/* This structure cannot exceed sizeof(unsigned long [5]) AKA 20 bytes */
+struct asix_data {
+	u8 multi_filter[AX_MCAST_FILTER_SIZE];
+	u8 phymode;
+	u8 ledmode;
+	u8 eeprom_len;
+};
+
+struct ax88172_int_data {
+	__le16 res1;
+	u8 link;
+	__le16 res2;
+	u8 status;
+	__le16 res3;
+} __attribute__ ((packed));
+
+static int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
+			    u16 size, void *data)
+{
+	void *buf;
+	int err = -ENOMEM;
+
+	dev_dbg(dev->edev.dev, "asix_read_cmd() cmd=0x%02x value=0x%04x index=0x%04x size=%d",
+		cmd, value, index, size);
+
+	buf = malloc(size);
+	if (!buf)
+		goto out;
+
+	err = usb_control_msg(
+		dev->udev,
+		usb_rcvctrlpipe(dev->udev, 0),
+		cmd,
+		USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+		value,
+		index,
+		buf,
+		size,
+		USB_CTRL_GET_TIMEOUT);
+	if (err == size)
+		memcpy(data, buf, size);
+	else if (err >= 0)
+		err = -EINVAL;
+	free(buf);
+
+out:
+	return err;
+}
+
+static int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
+			     u16 size, void *data)
+{
+	void *buf = NULL;
+	int err = -ENOMEM;
+
+	dev_dbg(dev->edev.dev, "asix_write_cmd() cmd=0x%02x value=0x%04x index=0x%04x size=%d",
+		cmd, value, index, size);
+
+	if (data) {
+		buf = malloc(size);
+		if (!buf)
+			goto out;
+		memcpy(buf, data, size);
+	}
+
+	err = usb_control_msg(
+		dev->udev,
+		usb_sndctrlpipe(dev->udev, 0),
+		cmd,
+		USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+		value,
+		index,
+		buf,
+		size,
+		USB_CTRL_SET_TIMEOUT);
+	free(buf);
+
+out:
+	return err;
+}
+
+static inline int asix_set_sw_mii(struct usbnet *dev)
+{
+	int ret;
+	ret = asix_write_cmd(dev, AX_CMD_SET_SW_MII, 0x0000, 0, 0, NULL);
+	if (ret < 0)
+		dev_err(dev->edev.dev, "Failed to enable software MII access");
+	return ret;
+}
+
+static inline int asix_set_hw_mii(struct usbnet *dev)
+{
+	int ret;
+	ret = asix_write_cmd(dev, AX_CMD_SET_HW_MII, 0x0000, 0, 0, NULL);
+	if (ret < 0)
+		dev_err(dev->edev.dev, "Failed to enable hardware MII access");
+	return ret;
+}
+
+static int asix_mdio_read(struct miiphy_device *mdev, uint8_t phy_id,
+		uint8_t loc, uint16_t *val)
+{
+	struct eth_device *eth = mdev->edev;
+	struct usbnet *dev = eth->priv;
+	__le16 res;
+
+	asix_set_sw_mii(dev);
+	asix_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id,
+				(__u16)loc, 2, &res);
+	asix_set_hw_mii(dev);
+
+	dev_dbg(dev->edev.dev, "asix_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x",
+			phy_id, loc, le16_to_cpu(res));
+
+	*val = le16_to_cpu(res);
+
+	return 0;
+}
+
+static int asix_mdio_write(struct miiphy_device *mdev, uint8_t phy_id,
+		uint8_t loc, uint16_t val)
+{
+	struct eth_device *eth = mdev->edev;
+	struct usbnet *dev = eth->priv;
+	__le16 res = cpu_to_le16(val);
+
+	dev_dbg(dev->edev.dev, "asix_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x",
+			phy_id, loc, val);
+
+	asix_set_sw_mii(dev);
+	asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id, (__u16)loc, 2, &res);
+	asix_set_hw_mii(dev);
+
+	return 0;
+}
+
+static inline int asix_get_phy_addr(struct usbnet *dev)
+{
+	u8 buf[2];
+	int ret = asix_read_cmd(dev, AX_CMD_READ_PHY_ID, 0, 0, 2, buf);
+
+	dev_dbg(dev->edev.dev, "asix_get_phy_addr()");
+
+	if (ret < 0) {
+		dev_err(dev->edev.dev, "Error reading PHYID register: %02x", ret);
+		goto out;
+	}
+	dev_dbg(dev->edev.dev, "asix_get_phy_addr() returning 0x%04x", *((__le16 *)buf));
+	ret = buf[1];
+
+out:
+	return ret;
+}
+
+static int asix_sw_reset(struct usbnet *dev, u8 flags)
+{
+	int ret;
+
+        ret = asix_write_cmd(dev, AX_CMD_SW_RESET, flags, 0, 0, NULL);
+	if (ret < 0)
+		dev_err(dev->edev.dev, "Failed to send software reset: %02x", ret);
+
+	return ret;
+}
+
+static u16 asix_read_rx_ctl(struct usbnet *dev)
+{
+	__le16 v;
+	int ret = asix_read_cmd(dev, AX_CMD_READ_RX_CTL, 0, 0, 2, &v);
+
+	if (ret < 0) {
+		dev_err(dev->edev.dev, "Error reading RX_CTL register: %02x", ret);
+		goto out;
+	}
+	ret = le16_to_cpu(v);
+out:
+	return ret;
+}
+
+static int asix_write_rx_ctl(struct usbnet *dev, u16 mode)
+{
+	int ret;
+
+	dev_dbg(dev->edev.dev, "asix_write_rx_ctl() - mode = 0x%04x", mode);
+	ret = asix_write_cmd(dev, AX_CMD_WRITE_RX_CTL, mode, 0, 0, NULL);
+	if (ret < 0)
+		dev_err(dev->edev.dev, "Failed to write RX_CTL mode to 0x%04x: %02x",
+		       mode, ret);
+
+	return ret;
+}
+
+static u16 asix_read_medium_status(struct usbnet *dev)
+{
+	__le16 v;
+	int ret = asix_read_cmd(dev, AX_CMD_READ_MEDIUM_STATUS, 0, 0, 2, &v);
+
+	if (ret < 0) {
+		dev_err(dev->edev.dev, "Error reading Medium Status register: %02x", ret);
+		goto out;
+	}
+	ret = le16_to_cpu(v);
+out:
+	return ret;
+}
+
+static int asix_write_medium_mode(struct usbnet *dev, u16 mode)
+{
+	int ret;
+
+	dev_dbg(dev->edev.dev, "asix_write_medium_mode() - mode = 0x%04x", mode);
+	ret = asix_write_cmd(dev, AX_CMD_WRITE_MEDIUM_MODE, mode, 0, 0, NULL);
+	if (ret < 0)
+		dev_err(dev->edev.dev, "Failed to write Medium Mode mode to 0x%04x: %02x",
+			mode, ret);
+
+	return ret;
+}
+
+static int asix_write_gpio(struct usbnet *dev, u16 value, int sleep)
+{
+	int ret;
+
+	dev_dbg(dev->edev.dev,"asix_write_gpio() - value = 0x%04x", value);
+	ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS, value, 0, 0, NULL);
+	if (ret < 0)
+		dev_err(dev->edev.dev, "Failed to write GPIO value 0x%04x: %02x",
+			value, ret);
+
+	if (sleep)
+		mdelay(sleep);
+
+	return ret;
+}
+
+static int asix_get_ethaddr(struct eth_device *edev, unsigned char *adr)
+{
+	struct usbnet *udev = container_of(edev, struct usbnet, edev);
+	int ret;
+
+	/* Get the MAC address */
+	if ((ret = asix_read_cmd(udev, AX_CMD_READ_NODE_ID,
+				0, 0, 6, adr)) < 0) {
+		debug("Failed to read MAC address: %d", ret);
+		return -1;
+	}
+
+	return 0;
+}
+
+static int asix_set_ethaddr(struct eth_device *edev, unsigned char *adr)
+{
+	/* not possible? */
+	return 0;
+}
+
+static int ax88172_get_ethaddr(struct eth_device *edev, unsigned char *adr)
+{
+	struct usbnet *udev = container_of(edev, struct usbnet, edev);
+	int ret;
+
+	/* Get the MAC address */
+	if ((ret = asix_read_cmd(udev, AX88172_CMD_READ_NODE_ID,
+				0, 0, 6, adr)) < 0) {
+		debug("read AX_CMD_READ_NODE_ID failed: %d", ret);
+		return -1;
+	}
+
+	return 0;
+}
+
+static int asix_rx_fixup(struct usbnet *dev, void *buf, int len)
+{
+	unsigned int header;
+	unsigned short size;
+
+	memcpy(&header, (void*) buf, sizeof(header));
+	le32_to_cpus(&header);
+	buf += 4;
+	len -= 4;
+
+	while (len > 0) {
+		if ((short)(header & 0x0000ffff) != ~((short)((header & 0xffff0000) >> 16)))
+			dev_err(&dev->dev, "asix_rx_fixup() Bad Header Length");
+	
+		/* get the packet length */
+		size = (unsigned short) (header & 0x0000ffff);
+
+		if (size > 1514) {
+			dev_err(&dev->dev, "asix_rx_fixup() Bad RX Length %d", size);
+			return 0;
+		}
+
+		NetReceive(buf, size);
+
+		buf += ((size + 1) & 0xfffe);
+		len -= ((size + 1) & 0xfffe);
+
+		if (len == 0)
+			break;
+
+		memcpy(&header, (void*) buf, sizeof(header));
+		le32_to_cpus(&header);
+		buf += 4;
+		len -= 4;
+	}
+
+	if (len < 0) {
+		dev_err(&dev->dev,"asix_rx_fixup() Bad SKB Length %d", len);
+		return -1;
+	}
+	return 0;
+}
+
+static int asix_tx_fixup(struct usbnet *dev,
+                                void *buf, int len,
+                                void *nbuf, int *nlen)
+{
+	unsigned int packet_len;
+
+	memmove(nbuf + 4, buf, len);
+
+	packet_len = ((len ^ 0x0000ffff) << 16) + len;
+	cpu_to_le32s(&packet_len);
+	memcpy(nbuf, &packet_len, 4);
+	len += 4;
+
+	if((len % 512) == 0) {
+		unsigned int padbytes = 0xffff0000;
+		cpu_to_le32s(&padbytes);
+		memcpy(nbuf + len, &padbytes, 4);
+		len += 4;
+	}
+
+	*nlen = len;
+
+	return 0;
+}
+
+static int asix_init_mii(struct usbnet *dev)
+{
+	dev->miiphy.read = asix_mdio_read;
+	dev->miiphy.write = asix_mdio_write;
+	dev->miiphy.address = asix_get_phy_addr(dev);
+	dev->miiphy.flags = 0;
+	dev->miiphy.edev = &dev->edev;
+
+	return miiphy_register(&dev->miiphy);
+}
+
+static int ax88172_link_reset(struct usbnet *dev)
+{
+	u8 mode;
+
+	mode = AX88172_MEDIUM_DEFAULT;
+
+//	if (ecmd.duplex != DUPLEX_FULL)
+//		mode |= ~AX88172_MEDIUM_FD;
+
+	asix_write_medium_mode(dev, mode);
+
+	return 0;
+}
+
+static int ax88172_bind(struct usbnet *dev)
+{
+	int ret = 0;
+	int i;
+	unsigned long gpio_bits = dev->driver_info->data;
+	struct asix_data *data = (struct asix_data *)&dev->data;
+
+	dev_dbg(&dev->dev, "%s\n", __func__);
+
+	data->eeprom_len = AX88172_EEPROM_LEN;
+
+	ret = usbnet_get_endpoints(dev);
+	if (ret) {
+		dev_err(&dev->dev, "can not get EPs\n");
+		return ret;
+	}
+
+	/* Toggle the GPIOs in a manufacturer/model specific way */
+	for (i = 2; i >= 0; i--) {
+		if ((ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS,
+					(gpio_bits >> (i * 8)) & 0xff, 0, 0,
+					NULL)) < 0)
+			goto out;
+		mdelay(5);
+	}
+
+	if ((ret = asix_write_rx_ctl(dev, 0x80)) < 0)
+		goto out;
+
+	dev->edev.get_ethaddr = ax88172_get_ethaddr;
+	dev->edev.set_ethaddr = asix_set_ethaddr;
+	asix_init_mii(dev);
+
+	return 0;
+
+out:
+	return ret;
+}
+
+static int ax88772_bind(struct usbnet *dev)
+{
+	int ret, embd_phy;
+	u16 rx_ctl;
+	struct asix_data *data = (struct asix_data *)&dev->data;
+
+	debug("%s\n", __func__);
+
+	data->eeprom_len = AX88772_EEPROM_LEN;
+
+	usbnet_get_endpoints(dev);
+
+	if ((ret = asix_write_gpio(dev,
+			AX_GPIO_RSE | AX_GPIO_GPO_2 | AX_GPIO_GPO2EN, 5)) < 0)
+		goto out;
+
+	/* 0x10 is the phy id of the embedded 10/100 ethernet phy */
+	embd_phy = ((asix_get_phy_addr(dev) & 0x1f) == 0x10 ? 1 : 0);
+	if ((ret = asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT,
+				embd_phy, 0, 0, NULL)) < 0) {
+		debug("Select PHY #1 failed: %d", ret);
+		goto out;
+	}
+
+	if ((ret = asix_sw_reset(dev, AX_SWRESET_IPPD | AX_SWRESET_PRL)) < 0)
+		goto out;
+
+	mdelay(150);
+	if ((ret = asix_sw_reset(dev, AX_SWRESET_CLEAR)) < 0)
+		goto out;
+
+	mdelay(150);
+	if (embd_phy) {
+		if ((ret = asix_sw_reset(dev, AX_SWRESET_IPRL)) < 0)
+			goto out;
+	}
+	else {
+		if ((ret = asix_sw_reset(dev, AX_SWRESET_PRTE)) < 0)
+			goto out;
+	}
+
+	mdelay(150);
+	rx_ctl = asix_read_rx_ctl(dev);
+	debug("RX_CTL is 0x%04x after software reset", rx_ctl);
+	if ((ret = asix_write_rx_ctl(dev, 0x0000)) < 0)
+		goto out;
+
+	rx_ctl = asix_read_rx_ctl(dev);
+	debug("RX_CTL is 0x%04x setting to 0x0000", rx_ctl);
+
+	dev->edev.get_ethaddr = asix_get_ethaddr;
+	dev->edev.set_ethaddr = asix_set_ethaddr;
+	asix_init_mii(dev);
+
+	if ((ret = asix_sw_reset(dev, AX_SWRESET_PRL)) < 0)
+		goto out;
+
+	mdelay(150);
+
+	if ((ret = asix_sw_reset(dev, AX_SWRESET_IPRL | AX_SWRESET_PRL)) < 0)
+		goto out;
+
+	mdelay(150);
+
+	if ((ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT)) < 0)
+		goto out;
+
+	if ((ret = asix_write_cmd(dev, AX_CMD_WRITE_IPG0,
+				AX88772_IPG0_DEFAULT | AX88772_IPG1_DEFAULT,
+				AX88772_IPG2_DEFAULT, 0, NULL)) < 0) {
+		debug("Write IPG,IPG1,IPG2 failed: %d", ret);
+		goto out;
+	}
+
+	/* Set RX_CTL to default values with 2k buffer, and enable cactus */
+	if ((ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL)) < 0)
+		goto out;
+
+	rx_ctl = asix_read_rx_ctl(dev);
+	debug("RX_CTL is 0x%04x after all initializations", rx_ctl);
+
+	rx_ctl = asix_read_medium_status(dev);
+	debug("Medium Status is 0x%04x after all initializations", rx_ctl);
+
+	/* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
+	if (dev->driver_info->flags & FLAG_FRAMING_AX) {
+		/* hard_mtu  is still the default - the device does not support
+		   jumbo eth frames */
+		dev->rx_urb_size = 2048;
+	}
+
+	return 0;
+
+out:
+	return ret;
+}
+
+static void asix_unbind(struct usbnet *dev)
+{
+	miiphy_unregister(&dev->miiphy);
+}
+
+static struct driver_info ax8817x_info = {
+	.description = "ASIX AX8817x USB 2.0 Ethernet",
+	.bind = ax88172_bind,
+	.unbind = asix_unbind,
+	.link_reset = ax88172_link_reset,
+	.reset = ax88172_link_reset,
+	.flags =  FLAG_ETHER,
+	.data = 0x00130103,
+};
+
+static struct driver_info dlink_dub_e100_info = {
+	.description = "DLink DUB-E100 USB Ethernet",
+	.bind = ax88172_bind,
+	.unbind = asix_unbind,
+	.link_reset = ax88172_link_reset,
+	.reset = ax88172_link_reset,
+	.flags =  FLAG_ETHER,
+	.data = 0x009f9d9f,
+};
+
+static struct driver_info netgear_fa120_info = {
+	.description = "Netgear FA-120 USB Ethernet",
+	.bind = ax88172_bind,
+	.unbind = asix_unbind,
+	.link_reset = ax88172_link_reset,
+	.reset = ax88172_link_reset,
+	.flags =  FLAG_ETHER,
+	.data = 0x00130103,
+};
+
+static struct driver_info hawking_uf200_info = {
+	.description = "Hawking UF200 USB Ethernet",
+	.bind = ax88172_bind,
+	.unbind = asix_unbind,
+	.link_reset = ax88172_link_reset,
+	.reset = ax88172_link_reset,
+	.flags =  FLAG_ETHER,
+	.data = 0x001f1d1f,
+};
+
+static struct driver_info ax88772_info = {
+	.description = "ASIX AX88772 USB 2.0 Ethernet",
+	.bind = ax88772_bind,
+	.unbind = asix_unbind,
+	.flags = FLAG_ETHER | FLAG_FRAMING_AX,
+	.rx_fixup = asix_rx_fixup,
+	.tx_fixup = asix_tx_fixup,
+};
+
+static const struct usb_device_id products [] = {
+{
+	// Linksys USB200M
+	USB_DEVICE (0x077b, 0x2226),
+	.driver_info =	&ax8817x_info,
+}, {
+	// Netgear FA120
+	USB_DEVICE (0x0846, 0x1040),
+	.driver_info =  &netgear_fa120_info,
+}, {
+	// DLink DUB-E100
+	USB_DEVICE (0x2001, 0x1a00),
+	.driver_info =  &dlink_dub_e100_info,
+}, {
+	// Intellinet, ST Lab USB Ethernet
+	USB_DEVICE (0x0b95, 0x1720),
+	.driver_info =  &ax8817x_info,
+}, {
+	// Hawking UF200, TrendNet TU2-ET100
+	USB_DEVICE (0x07b8, 0x420a),
+	.driver_info =  &hawking_uf200_info,
+}, {
+	// Billionton Systems, USB2AR
+	USB_DEVICE (0x08dd, 0x90ff),
+	.driver_info =  &ax8817x_info,
+}, {
+	// ATEN UC210T
+	USB_DEVICE (0x0557, 0x2009),
+	.driver_info =  &ax8817x_info,
+}, {
+	// Buffalo LUA-U2-KTX
+	USB_DEVICE (0x0411, 0x003d),
+	.driver_info =  &ax8817x_info,
+}, {
+	// Sitecom LN-029 "USB 2.0 10/100 Ethernet adapter"
+	USB_DEVICE (0x6189, 0x182d),
+	.driver_info =  &ax8817x_info,
+}, {
+	// corega FEther USB2-TX
+	USB_DEVICE (0x07aa, 0x0017),
+	.driver_info =  &ax8817x_info,
+}, {
+	// Surecom EP-1427X-2
+	USB_DEVICE (0x1189, 0x0893),
+	.driver_info = &ax8817x_info,
+}, {
+	// goodway corp usb gwusb2e
+	USB_DEVICE (0x1631, 0x6200),
+	.driver_info = &ax8817x_info,
+}, {
+	// JVC MP-PRX1 Port Replicator
+	USB_DEVICE (0x04f1, 0x3008),
+	.driver_info = &ax8817x_info,
+}, {
+	// ASIX AX88772 10/100
+	USB_DEVICE (0x0b95, 0x7720),
+	.driver_info = &ax88772_info,
+}, {
+	// Linksys USB200M Rev 2
+	USB_DEVICE (0x13b1, 0x0018),
+	.driver_info = &ax88772_info,
+}, {
+	// 0Q0 cable ethernet
+	USB_DEVICE (0x1557, 0x7720),
+	.driver_info = &ax88772_info,
+}, {
+	// DLink DUB-E100 H/W Ver B1
+	USB_DEVICE (0x07d1, 0x3c05),
+	.driver_info = &ax88772_info,
+}, {
+	// DLink DUB-E100 H/W Ver B1 Alternate
+	USB_DEVICE (0x2001, 0x3c05),
+	.driver_info = &ax88772_info,
+}, {
+	// Apple USB Ethernet Adapter
+	USB_DEVICE(0x05ac, 0x1402),
+	.driver_info = &ax88772_info,
+}, {
+	// Cables-to-Go USB Ethernet Adapter
+	USB_DEVICE(0x0b95, 0x772a),
+	.driver_info = &ax88772_info,
+},
+	{ },		// END
+};
+
+static struct usb_driver asix_driver = {
+	.name =		"asix",
+	.id_table =	products,
+	.probe =	usbnet_probe,
+	.disconnect =	usbnet_disconnect,
+};
+
+static int __init asix_init(void)
+{
+ 	return usb_driver_register(&asix_driver);
+}
+device_initcall(asix_init);
+
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
new file mode 100644
index 0000000000..fff6a1710b
--- /dev/null
+++ b/drivers/net/usb/usbnet.c
@@ -0,0 +1,252 @@
+#include <common.h>
+#include <usb/usb.h>
+#include <usb/usbnet.h>
+#include <asm/byteorder.h>
+#include <errno.h>
+#include <malloc.h>
+
+static inline int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd)
+{
+	return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN);
+}
+
+/* handles CDC Ethernet and many other network "bulk data" interfaces */
+int usbnet_get_endpoints(struct usbnet *dev)
+{
+	struct usb_device	*udev = dev->udev;
+	int				tmp;
+	struct usb_interface_descriptor	*alt = NULL;
+	struct usb_endpoint_descriptor	*in = NULL, *out = NULL;
+	struct usb_endpoint_descriptor	*status = NULL;
+
+	for (tmp = 0; tmp < udev->config.no_of_if; tmp++) {
+		unsigned	ep;
+
+		in = out = status = NULL;
+		alt = &udev->config.if_desc[tmp];
+
+		/* take the first altsetting with in-bulk + out-bulk;
+		 * remember any status endpoint, just in case;
+		 * ignore other endpoints and altsetttings.
+		 */
+		for (ep = 0; ep < alt->bNumEndpoints; ep++) {
+			struct usb_endpoint_descriptor	*e;
+			int				intr = 0;
+
+			e = &alt->ep_desc[ep];
+			switch (e->bmAttributes) {
+			case USB_ENDPOINT_XFER_INT:
+				if (!usb_endpoint_dir_in(e))
+					continue;
+				intr = 1;
+				/* FALLTHROUGH */
+			case USB_ENDPOINT_XFER_BULK:
+				break;
+			default:
+				continue;
+			}
+			if (usb_endpoint_dir_in(e)) {
+				if (!intr && !in)
+					in = e;
+				else if (intr && !status)
+					status = e;
+			} else {
+				if (!out)
+					out = e;
+			}
+		}
+		if (in && out)
+			break;
+	}
+
+	if (!alt || !in || !out)
+		return -EINVAL;
+
+	if (alt->bAlternateSetting != 0
+			|| !(dev->driver_info->flags & FLAG_NO_SETINT)) {
+		tmp = usb_set_interface (dev->udev, alt->bInterfaceNumber,
+				alt->bAlternateSetting);
+		if (tmp < 0)
+			return tmp;
+	}
+
+	dev->in = usb_rcvbulkpipe (dev->udev,
+			in->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
+	dev->out = usb_sndbulkpipe (dev->udev,
+			out->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
+	dev_dbg(&dev->dev, "found endpoints: IN=%d OUT=%d\n",
+			in->bEndpointAddress, out->bEndpointAddress);
+
+	return 0;
+}
+EXPORT_SYMBOL(usbnet_get_endpoints);
+
+char tx_buffer[4096];
+
+static int usbnet_send(struct eth_device *edev, void *eth_data, int data_length)
+{
+	struct usbnet		*dev = edev->priv;
+	struct driver_info	*info = dev->driver_info;
+	int			len, alen, ret;
+
+	dev_dbg(&dev->dev, "%s\n",__func__);
+
+	/* some devices want funky USB-level framing, for
+	 * win32 driver (usually) and/or hardware quirks
+	 */
+        if(info->tx_fixup) {
+                if(info->tx_fixup(dev, eth_data, data_length, tx_buffer, &len)) {
+                        dev_dbg(&dev->dev, "can't tx_fixup packet");
+                        return 0;
+                }
+        } else {
+                len = data_length;
+                memmove(tx_buffer, (void*) eth_data, len);
+        }
+
+	/* don't assume the hardware handles USB_ZERO_PACKET
+	 * NOTE:  strictly conforming cdc-ether devices should expect
+	 * the ZLP here, but ignore the one-byte packet.
+	 */
+	if ((len % dev->maxpacket) == 0)
+		tx_buffer[len++] = 0;
+
+	ret = usb_bulk_msg(dev->udev, dev->out, tx_buffer, len, &alen, 1000);
+	dev_dbg(edev->dev, "%s: ret: %d len: %d alen: %d\n", __func__, ret, len, alen);
+
+	return 0;
+}
+
+static char rx_buf[4096];
+
+static int usbnet_recv(struct eth_device *edev)
+{
+	struct usbnet		*dev = (struct usbnet*) edev->priv;
+	struct driver_info	*info = dev->driver_info;
+	int len, alen = 0;
+
+	dev_dbg(edev->dev, "%s\n",__func__);
+
+	len = dev->rx_urb_size;
+
+	usb_bulk_msg(dev->udev, dev->in, rx_buf, len, &alen,
+				1000);
+
+	if(alen) {
+		if (info->rx_fixup)
+			return info->rx_fixup(dev, rx_buf, alen);
+		else
+			NetReceive(rx_buf, alen);
+	}
+
+        return 0;
+}
+
+static int usbnet_init(struct eth_device *edev)
+{
+	struct usbnet		*dev = (struct usbnet*) edev->priv;
+	struct driver_info      *info = dev->driver_info;
+	int ret = 0;
+
+	dev_dbg(edev->dev, "%s\n",__func__);
+
+	/* put into "known safe" state */
+	if (info->reset)
+		ret = info->reset(dev);
+
+	if (ret) {
+                dev_info (edev->dev, "open reset fail (%d)", ret);
+                return ret;
+        }
+
+	miiphy_restart_aneg(&dev->miiphy);
+
+	return 0;
+}
+
+static int usbnet_open(struct eth_device *edev)
+{
+	struct usbnet		*dev = (struct usbnet*)edev->priv;
+
+	dev_dbg(edev->dev, "%s\n",__func__);
+
+	if (miiphy_wait_aneg(&dev->miiphy))
+		return -1;
+
+	miiphy_print_status(&dev->miiphy);
+
+	return 0;
+}
+
+static void usbnet_halt(struct eth_device *edev)
+{
+	dev_dbg(edev->dev, "%s\n",__func__);
+}
+
+int usbnet_probe(struct usb_device *usbdev, const struct usb_device_id *prod)
+{
+	struct usbnet *undev;
+	struct eth_device *edev;
+	struct driver_info *info;
+	int status;
+
+	dev_dbg(edev->dev, "%s\n", __func__);
+
+	undev = xzalloc(sizeof (*undev));
+
+	usbdev->drv_data = undev;
+
+	edev = &undev->edev;
+	undev->udev = usbdev;
+
+	edev->open = usbnet_open,
+	edev->init = usbnet_init,
+	edev->send = usbnet_send,
+	edev->recv = usbnet_recv,
+	edev->halt = usbnet_halt,
+	edev->priv = undev;
+	edev->dev  = &undev->dev;
+
+	get_free_deviceid(edev->dev->id, "eth");
+	sprintf(edev->dev->name, "%s", "usbnet");
+
+	info = (struct driver_info *)prod->driver_info;
+	undev->driver_info = info;
+
+	if (info->bind) {
+		status = info->bind (undev);
+		if (status < 0)
+			goto out1;
+	}
+
+	if (!undev->rx_urb_size)
+		undev->rx_urb_size = 1514; /* FIXME: What to put here? */
+	undev->maxpacket = usb_maxpacket(undev->udev, undev->out);
+
+	/* FIXME: eth layer should have the device and register it */
+	register_device(edev->dev);
+
+	eth_register(edev);
+
+	return 0;
+out1:
+	dev_dbg(edev->dev, "err: %d\n", status);
+	return status;
+}
+
+void usbnet_disconnect(struct usb_device *usbdev)
+{
+	struct usbnet *undev = usbdev->drv_data;
+	struct eth_device *edev = &undev->edev;
+	struct driver_info *info;
+
+	eth_unregister(edev);
+	unregister_device(edev->dev);
+
+	info = undev->driver_info;
+	if (info->unbind)
+		info->unbind(undev);
+
+	free(undev);
+}
+
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 2b33cab35a..a41406f931 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -6,4 +6,11 @@ if USB
 config USB_EHCI
 	bool "EHCI driver"
 
+config USB_ULPI
+	bool
+
+config USB_ISP1504
+	select USB_ULPI
+	bool "ISP1504 Tranceiver support"
+
 endif
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 5ca3d11751..23c5c6ca59 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -1,2 +1,4 @@
-obj-$(CONFIG_USB)	+= usb.o
-obj-$(CONFIG_USB_EHCI)	+= usb_ehci_core.o
+obj-$(CONFIG_USB)		+= usb.o
+obj-$(CONFIG_USB_EHCI)		+= usb_ehci_core.o
+obj-$(CONFIG_USB_ULPI)		+= ulpi.o
+obj-$(CONFIG_USB_ISP1504)	+= isp1504.o
diff --git a/drivers/usb/isp1504.c b/drivers/usb/isp1504.c
new file mode 100644
index 0000000000..9ba74b157b
--- /dev/null
+++ b/drivers/usb/isp1504.c
@@ -0,0 +1,37 @@
+#include <common.h>
+#include <usb/ulpi.h>
+#include <usb/isp1504.h>
+
+int isp1504_set_vbus_power(void __iomem *view, int on)
+{
+	int vid, pid, ret = 0;
+
+	vid = (ulpi_read(ISP1504_VID_HIGH, view) << 8) |
+		ulpi_read(ISP1504_VID_LOW, view);
+	pid = (ulpi_read(ISP1504_PID_HIGH, view) << 8) |
+		ulpi_read(ISP1504_PID_LOW, view);
+
+	pr_info("ULPI Vendor ID 0x%x    Product ID 0x%x\n", vid, pid);
+	if (vid != 0x4cc || pid != 0x1504) {
+		pr_err("No ISP1504 found\n");
+		return -1;
+	}
+
+	if (on) {
+		ret = ulpi_set(DRV_VBUS_EXT |       /* enable external Vbus */
+				DRV_VBUS |          /* enable internal Vbus */
+				USE_EXT_VBUS_IND |  /* use external indicator */
+				CHRG_VBUS,          /* charge Vbus */
+				ISP1504_OTGCTL, view);
+	} else {
+		ret = ulpi_clear(DRV_VBUS_EXT | /* disable external Vbus */
+				DRV_VBUS,         /* disable internal Vbus */
+				ISP1504_OTGCTL, view);
+
+		ret |= ulpi_set(USE_EXT_VBUS_IND | /* use external indicator */
+				DISCHRG_VBUS,          /* discharge Vbus */
+				ISP1504_OTGCTL, view);
+	}
+
+	return ret;
+}
diff --git a/drivers/usb/ulpi.c b/drivers/usb/ulpi.c
new file mode 100644
index 0000000000..4a898fb223
--- /dev/null
+++ b/drivers/usb/ulpi.c
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2008 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <errno.h>
+#include <usb/ulpi.h>
+
+/* ULPIVIEW register bits */
+#define ULPIVW_WU		(1 << 31)	/* Wakeup */
+#define ULPIVW_RUN		(1 << 30)	/* read/write run */
+#define ULPIVW_WRITE		(1 << 29)	/* 0 = read  1 = write */
+#define ULPIVW_SS		(1 << 27)	/* SyncState */
+#define ULPIVW_PORT_MASK	0x07	/* Port field */
+#define ULPIVW_PORT_SHIFT	24
+#define ULPIVW_ADDR_MASK	0xFF	/* data address field */
+#define ULPIVW_ADDR_SHIFT	16
+#define ULPIVW_RDATA_MASK	0xFF	/* read data field */
+#define ULPIVW_RDATA_SHIFT	8
+#define ULPIVW_WDATA_MASK	0xFF	/* write data field */
+#define ULPIVW_WDATA_SHIFT	0
+
+static int ulpi_poll(void __iomem *view, uint32_t bit)
+{
+	uint32_t data;
+	int timeout = 10000;
+
+	data = readl(view);
+	while (data & bit) {
+		if (!timeout--)
+			return -ETIMEDOUT;
+
+		udelay(1);
+		data = readl(view);
+	}
+	return (data >> ULPIVW_RDATA_SHIFT) & ULPIVW_RDATA_MASK;
+}
+
+int ulpi_read(int reg, void __iomem *view)
+{
+	int ret;
+
+	/* make sure interface is running */
+	if (!(readl(view) && ULPIVW_SS)) {
+		writel(ULPIVW_WU, view);
+
+		/* wait for wakeup */
+		ret = ulpi_poll(view, ULPIVW_WU);
+		if (ret < 0)
+			return ret;
+	}
+
+	/* read the register */
+	writel((ULPIVW_RUN | (reg << ULPIVW_ADDR_SHIFT)), view);
+
+	/* wait for completion */
+	return ulpi_poll(view, ULPIVW_RUN);
+}
+EXPORT_SYMBOL(ulpi_read);
+
+int ulpi_set(u8 bits, int reg, void __iomem *view)
+{
+	int ret;
+
+	/* make sure the interface is running */
+	if (!(readl(view) && ULPIVW_SS)) {
+		writel(ULPIVW_WU, view);
+		/* wait for wakeup */
+		ret = ulpi_poll(view, ULPIVW_WU);
+		if (ret < 0)
+			return ret;
+	}
+
+	writel((ULPIVW_RUN | ULPIVW_WRITE |
+		      ((reg + ISP1504_REG_SET) << ULPIVW_ADDR_SHIFT) |
+		      ((bits & ULPIVW_WDATA_MASK) << ULPIVW_WDATA_SHIFT)),
+		     view);
+
+	/* wait for completion */
+	ret = ulpi_poll(view, ULPIVW_RUN);
+	if (ret < 0)
+		return ret;
+	return 0;
+}
+EXPORT_SYMBOL(ulpi_set);
+
+int ulpi_clear(u8 bits, int reg, void __iomem *view)
+{
+	int ret;
+
+	writel((ULPIVW_RUN | ULPIVW_WRITE |
+		      ((reg + ISP1504_REG_CLEAR) << ULPIVW_ADDR_SHIFT) |
+		      ((bits & ULPIVW_WDATA_MASK) << ULPIVW_WDATA_SHIFT)),
+		     view);
+
+	/* wait for completion */
+	ret = ulpi_poll(view, ULPIVW_RUN);
+	if (ret < 0)
+		return ret;
+	return 0;
+}
+EXPORT_SYMBOL(ulpi_clear);
+
diff --git a/drivers/usb/usb.c b/drivers/usb/usb.c
index 6feadeaed9..61fddfa5d8 100644
--- a/drivers/usb/usb.c
+++ b/drivers/usb/usb.c
@@ -46,12 +46,16 @@
  */
 #include <common.h>
 #include <command.h>
+#include <malloc.h>
+#include <driver.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
+#include <xfuncs.h>
+#include <init.h>
 
-#include <usb.h>
+#include <usb/usb.h>
 
-#undef USB_DEBUG
+/* #define USB_DEBUG */
 
 #ifdef	USB_DEBUG
 #define	USB_PRINTF(fmt, args...)	printf(fmt , ##args)
@@ -61,182 +65,55 @@
 
 #define USB_BUFSIZ	512
 
-static struct usb_device usb_dev[USB_MAX_DEVICE];
 static int dev_index;
-static int running;
 static int asynch_allowed;
 static struct devrequest setup_packet;
 
-char usb_started; /* flag for the started/stopped USB status */
-
-/**********************************************************************
- * some forward declerations...
- */
-void usb_scan_devices(void);
-
-int usb_hub_probe(struct usb_device *dev, int ifnum);
-void usb_hub_reset(void);
+static int usb_hub_probe(struct usb_device *dev, int ifnum);
 static int hub_port_reset(struct usb_device *dev, int port,
 			  unsigned short *portstat);
 
-/***************************************************************************
- * Init USB Device
- */
-
-int usb_init(void)
-{
-	int result;
-
-	running = 0;
-	dev_index = 0;
-	asynch_allowed = 1;
-	usb_hub_reset();
-	/* init low_level USB */
-	printf("USB:   ");
-	result = usb_lowlevel_init();
-	/* if lowlevel init is OK, scan the bus for devices
-	 * i.e. search HUBs and configure them */
-	if (result == 0) {
-		printf("scanning bus for devices... ");
-		running = 1;
-		usb_scan_devices();
-		usb_started = 1;
-		return 0;
-	} else {
-		printf("Error, couldn't init Lowlevel part\n");
-		usb_started = 0;
-		return -1;
-	}
-}
-
-/******************************************************************************
- * Stop USB this stops the LowLevel Part and deregisters USB devices.
- */
-int usb_stop(void)
-{
-	int res = 0;
-
-	if (usb_started) {
-		asynch_allowed = 1;
-		usb_started = 0;
-		usb_hub_reset();
-		res = usb_lowlevel_stop();
-	}
-	return res;
-}
+static LIST_HEAD(host_list);
+static LIST_HEAD(usb_device_list);
 
-/*
- * disables the asynch behaviour of the control message. This is used for data
- * transfers that uses the exclusiv access to the control and bulk messages.
- */
-void usb_disable_asynch(int disable)
+static void print_usb_device(struct usb_device *dev)
 {
-	asynch_allowed = !disable;
+	printf("%s: %04x:%04x %s\n", dev->dev.name,
+			dev->descriptor.idVendor,
+			dev->descriptor.idProduct,
+			dev->prod);
 }
 
+static int host_busnum;
 
-/*-------------------------------------------------------------------
- * Message wrappers.
- *
- */
-
-/*
- * submits an Interrupt Message
- */
-int usb_submit_int_msg(struct usb_device *dev, unsigned long pipe,
-			void *buffer, int transfer_len, int interval)
+int usb_register_host(struct usb_host *host)
 {
-	return submit_int_msg(dev, pipe, buffer, transfer_len, interval);
+	list_add_tail(&host->list, &host_list);
+	host->busnum = host_busnum++;
+	asynch_allowed = 1;
+	return 0;
 }
 
-/*
- * submits a control message and waits for comletion (at least timeout * 1ms)
- * If timeout is 0, we don't wait for completion (used as example to set and
- * clear keyboards LEDs). For data transfers, (storage transfers) we don't
- * allow control messages with 0 timeout, by previousely resetting the flag
- * asynch_allowed (usb_disable_asynch(1)).
- * returns the transfered length if OK or -1 if error. The transfered length
- * and the current status are stored in the dev->act_len and dev->status.
+/**
+ * set configuration number to configuration
  */
-int usb_control_msg(struct usb_device *dev, unsigned int pipe,
-			unsigned char request, unsigned char requesttype,
-			unsigned short value, unsigned short index,
-			void *data, unsigned short size, int timeout)
+static int usb_set_configuration(struct usb_device *dev, int configuration)
 {
-	if ((timeout == 0) && (!asynch_allowed)) {
-		/* request for a asynch control pipe is not allowed */
-		return -1;
-	}
-
+	int res;
+	USB_PRINTF("set configuration %d\n", configuration);
 	/* set setup command */
-	setup_packet.requesttype = requesttype;
-	setup_packet.request = request;
-	setup_packet.value = cpu_to_le16(value);
-	setup_packet.index = cpu_to_le16(index);
-	setup_packet.length = cpu_to_le16(size);
-	USB_PRINTF("usb_control_msg: request: 0x%X, requesttype: 0x%X, " \
-		   "value 0x%X index 0x%X length 0x%X\n",
-		   request, requesttype, value, index, size);
-	dev->status = USB_ST_NOT_PROC; /*not yet processed */
-
-	submit_control_msg(dev, pipe, data, size, &setup_packet);
-	if (timeout == 0)
-		return (int)size;
-
-	if (dev->status != 0) {
-		/*
-		 * Let's wait a while for the timeout to elapse.
-		 * It has no real use, but it keeps the interface happy.
-		 */
-		wait_ms(timeout);
-		return -1;
-	}
-
-	return dev->act_len;
-}
-
-/*-------------------------------------------------------------------
- * submits bulk message, and waits for completion. returns 0 if Ok or
- * -1 if Error.
- * synchronous behavior
- */
-int usb_bulk_msg(struct usb_device *dev, unsigned int pipe,
-			void *data, int len, int *actual_length, int timeout)
-{
-	if (len < 0)
-		return -1;
-	dev->status = USB_ST_NOT_PROC; /*not yet processed */
-	submit_bulk_msg(dev, pipe, data, len);
-	while (timeout--) {
-		if (!((volatile unsigned long)dev->status & USB_ST_NOT_PROC))
-			break;
-		wait_ms(1);
-	}
-	*actual_length = dev->act_len;
-	if (dev->status == 0)
+	res = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+				USB_REQ_SET_CONFIGURATION, 0,
+				configuration, 0,
+				NULL, 0, USB_CNTL_TIMEOUT);
+	if (res == 0) {
+		dev->toggle[0] = 0;
+		dev->toggle[1] = 0;
 		return 0;
-	else
+	} else
 		return -1;
 }
 
-
-/*-------------------------------------------------------------------
- * Max Packet stuff
- */
-
-/*
- * returns the max packet size, depending on the pipe direction and
- * the configurations values
- */
-int usb_maxpacket(struct usb_device *dev, unsigned long pipe)
-{
-	/* direction is out -> use emaxpacket out */
-	if ((pipe & USB_DIR_IN) == 0)
-		return dev->epmaxpacketout[((pipe>>15) & 0xf)];
-	else
-		return dev->epmaxpacketin[((pipe>>15) & 0xf)];
-}
-
 /* The routine usb_set_maxpacket_ep() is extracted from the loop of routine
  * usb_set_maxpacket(), because the optimizer of GCC 4.x chokes on this routine
  * when it is inlined in 1 single routine. What happens is that the register r3
@@ -281,7 +158,7 @@ usb_set_maxpacket_ep(struct usb_device *dev, struct usb_endpoint_descriptor *ep)
 /*
  * set the max packed value of all endpoints in the given configuration
  */
-int usb_set_maxpacket(struct usb_device *dev)
+static int usb_set_maxpacket(struct usb_device *dev)
 {
 	int i, ii;
 
@@ -293,11 +170,11 @@ int usb_set_maxpacket(struct usb_device *dev)
 	return 0;
 }
 
-/*******************************************************************************
+/**
  * Parse the config, located in buffer, and fills the dev->config structure.
  * Note that all little/big endian swapping are done automatically.
  */
-int usb_parse_config(struct usb_device *dev, unsigned char *buffer, int cfgno)
+static int usb_parse_config(struct usb_device *dev, unsigned char *buffer, int cfgno)
 {
 	struct usb_descriptor_header *head;
 	int index, ifno, epno, curr_if_num;
@@ -373,6 +250,370 @@ int usb_parse_config(struct usb_device *dev, unsigned char *buffer, int cfgno)
 	return 1;
 }
 
+/**
+ * set address of a device to the value in dev->devnum.
+ * This can only be done by addressing the device via the default address (0)
+ */
+static int usb_set_address(struct usb_device *dev)
+{
+	int res;
+
+	USB_PRINTF("set address %d\n", dev->devnum);
+	res = usb_control_msg(dev, usb_snddefctrl(dev),
+				USB_REQ_SET_ADDRESS, 0,
+				(dev->devnum), 0,
+				NULL, 0, USB_CNTL_TIMEOUT);
+	return res;
+}
+
+static int usb_get_descriptor(struct usb_device *dev, unsigned char type,
+			unsigned char index, void *buf, int size)
+{
+	int res;
+	res = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
+			USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,
+			(type << 8) + index, 0,
+			buf, size, USB_CNTL_TIMEOUT);
+	return res;
+}
+
+/*
+ * By the time we get here, the device has gotten a new device ID
+ * and is in the default state. We need to identify the thing and
+ * get the ball rolling..
+ *
+ * Returns 0 for success, != 0 for error.
+ */
+static int usb_new_device(struct usb_device *dev)
+{
+	int addr, err;
+	int tmp;
+	unsigned char tmpbuf[USB_BUFSIZ];
+	struct usb_device_descriptor *desc;
+	int port = -1;
+	struct usb_device *parent = dev->parent;
+	unsigned short portstatus;
+
+	/* We still haven't set the Address yet */
+	addr = dev->devnum;
+	dev->devnum = 0;
+
+	/* This is a Windows scheme of initialization sequence, with double
+	 * reset of the device (Linux uses the same sequence)
+	 * Some equipment is said to work only with such init sequence; this
+	 * patch is based on the work by Alan Stern:
+	 * http://sourceforge.net/mailarchive/forum.php?
+	 * thread_id=5729457&forum_id=5398
+	 */
+
+	/* send 64-byte GET-DEVICE-DESCRIPTOR request.  Since the descriptor is
+	 * only 18 bytes long, this will terminate with a short packet.  But if
+	 * the maxpacket size is 8 or 16 the device may be waiting to transmit
+	 * some more, or keeps on retransmitting the 8 byte header. */
+
+	desc = (struct usb_device_descriptor *)tmpbuf;
+	dev->descriptor.bMaxPacketSize0 = 64;	    /* Start off at 64 bytes  */
+	/* Default to 64 byte max packet size */
+	dev->maxpacketsize = PACKET_SIZE_64;
+	dev->epmaxpacketin[0] = 64;
+	dev->epmaxpacketout[0] = 64;
+
+	err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, desc, 64);
+	if (err < 0) {
+		USB_PRINTF("%s: usb_get_descriptor() failed\n", __func__);
+		return 1;
+	}
+
+	dev->descriptor.bMaxPacketSize0 = desc->bMaxPacketSize0;
+
+	/* find the port number we're at */
+	if (parent) {
+		int j;
+
+		for (j = 0; j < parent->maxchild; j++) {
+			if (parent->children[j] == dev) {
+				port = j;
+				break;
+			}
+		}
+		if (port < 0) {
+			printf("%s: cannot locate device's port.\n", __func__);
+			return 1;
+		}
+
+		/* reset the port for the second time */
+		err = hub_port_reset(dev->parent, port, &portstatus);
+		if (err < 0) {
+			printf("\n     Couldn't reset port %i\n", port);
+			return 1;
+		}
+	}
+
+	dev->epmaxpacketin[0] = dev->descriptor.bMaxPacketSize0;
+	dev->epmaxpacketout[0] = dev->descriptor.bMaxPacketSize0;
+	switch (dev->descriptor.bMaxPacketSize0) {
+	case 8:
+		dev->maxpacketsize  = PACKET_SIZE_8;
+		break;
+	case 16:
+		dev->maxpacketsize = PACKET_SIZE_16;
+		break;
+	case 32:
+		dev->maxpacketsize = PACKET_SIZE_32;
+		break;
+	case 64:
+		dev->maxpacketsize = PACKET_SIZE_64;
+		break;
+	}
+	dev->devnum = addr;
+
+	err = usb_set_address(dev); /* set address */
+
+	if (err < 0) {
+		printf("\n      USB device not accepting new address " \
+			"(error=%lX)\n", dev->status);
+		return 1;
+	}
+
+	wait_ms(10);	/* Let the SET_ADDRESS settle */
+
+	tmp = sizeof(dev->descriptor);
+
+	err = usb_get_descriptor(dev, USB_DT_DEVICE, 0,
+				 &dev->descriptor, sizeof(dev->descriptor));
+	if (err < tmp) {
+		if (err < 0)
+			printf("unable to get device descriptor (error=%d)\n",
+			       err);
+		else
+			printf("USB device descriptor short read " \
+				"(expected %i, got %i)\n", tmp, err);
+		return 1;
+	}
+	/* correct le values */
+	le16_to_cpus(&dev->descriptor.bcdUSB);
+	le16_to_cpus(&dev->descriptor.idVendor);
+	le16_to_cpus(&dev->descriptor.idProduct);
+	le16_to_cpus(&dev->descriptor.bcdDevice);
+	/* only support for one config for now */
+	usb_get_configuration_no(dev, &tmpbuf[0], 0);
+	usb_parse_config(dev, &tmpbuf[0], 0);
+	usb_set_maxpacket(dev);
+	/* we set the default configuration here */
+	if (usb_set_configuration(dev, dev->config.bConfigurationValue)) {
+		printf("failed to set default configuration " \
+			"len %d, status %lX\n", dev->act_len, dev->status);
+		return -1;
+	}
+	USB_PRINTF("new device: Mfr=%d, Product=%d, SerialNumber=%d\n",
+		   dev->descriptor.iManufacturer, dev->descriptor.iProduct,
+		   dev->descriptor.iSerialNumber);
+	memset(dev->mf, 0, sizeof(dev->mf));
+	memset(dev->prod, 0, sizeof(dev->prod));
+	memset(dev->serial, 0, sizeof(dev->serial));
+	if (dev->descriptor.iManufacturer)
+		usb_string(dev, dev->descriptor.iManufacturer,
+			   dev->mf, sizeof(dev->mf));
+	if (dev->descriptor.iProduct)
+		usb_string(dev, dev->descriptor.iProduct,
+			   dev->prod, sizeof(dev->prod));
+	if (dev->descriptor.iSerialNumber)
+		usb_string(dev, dev->descriptor.iSerialNumber,
+			   dev->serial, sizeof(dev->serial));
+	/* now prode if the device is a hub */
+	usb_hub_probe(dev, 0);
+
+	sprintf(dev->dev.name, "usb%d-%d", dev->host->busnum, dev->devnum);
+	sprintf(dev->dev.id, "usb%d-%d", dev->host->busnum, dev->devnum);
+
+	print_usb_device(dev);
+
+	register_device(&dev->dev);
+	list_add_tail(&dev->list, &usb_device_list);
+
+	return 0;
+}
+
+static struct usb_device *usb_alloc_new_device(void)
+{
+	struct usb_device *usbdev = xzalloc(sizeof (*usbdev));
+
+	if (!usbdev)
+		return NULL;
+
+	usbdev->devnum = dev_index + 1;
+	usbdev->maxchild = 0;
+	usbdev->dev.bus = &usb_bus_type;
+
+	dev_index++;
+
+	return usbdev;
+}
+
+static int __usb_init(void)
+{
+	struct usb_device *dev;
+	struct usb_host *host;
+
+	list_for_each_entry(dev, &usb_device_list, list) {
+		unregister_device(&dev->dev);
+		if (dev->hub)
+			free(dev->hub);
+		free(dev);
+	}
+
+	printf("USB: scanning bus for devices...\n");
+	dev_index = 0;
+
+	list_for_each_entry(host, &host_list, list) {
+		host->init(host);
+
+		dev = usb_alloc_new_device();
+		dev->host = host;
+		usb_new_device(dev);
+	}
+
+	printf("%d USB Device(s) found\n", dev_index);
+
+	return 0;
+}
+
+static int do_usb(cmd_tbl_t *cmdtp, int argc, char *argv[])
+{
+	__usb_init();
+
+	return 0;
+}
+
+static const __maybe_unused char cmd_usb_help[] =
+"Usage: usb\n"
+"(re-)detect USB devices\n";
+
+U_BOOT_CMD_START(usb)
+	.maxargs	= CONFIG_MAXARGS,
+	.cmd		= do_usb,
+	.usage		= "(re-)detect USB devices",
+	U_BOOT_CMD_HELP(cmd_usb_help)
+U_BOOT_CMD_END
+
+/*
+ * disables the asynch behaviour of the control message. This is used for data
+ * transfers that uses the exclusiv access to the control and bulk messages.
+ */
+void usb_disable_asynch(int disable)
+{
+	asynch_allowed = !disable;
+}
+
+
+/*-------------------------------------------------------------------
+ * Message wrappers.
+ *
+ */
+
+/*
+ * submits an Interrupt Message
+ */
+int usb_submit_int_msg(struct usb_device *dev, unsigned long pipe,
+			void *buffer, int transfer_len, int interval)
+{
+	struct usb_host *host = dev->host;
+
+	return host->submit_int_msg(dev, pipe, buffer, transfer_len, interval);
+}
+
+/*
+ * submits a control message and waits for comletion (at least timeout * 1ms)
+ * If timeout is 0, we don't wait for completion (used as example to set and
+ * clear keyboards LEDs). For data transfers, (storage transfers) we don't
+ * allow control messages with 0 timeout, by previousely resetting the flag
+ * asynch_allowed (usb_disable_asynch(1)).
+ * returns the transfered length if OK or -1 if error. The transfered length
+ * and the current status are stored in the dev->act_len and dev->status.
+ */
+int usb_control_msg(struct usb_device *dev, unsigned int pipe,
+			unsigned char request, unsigned char requesttype,
+			unsigned short value, unsigned short index,
+			void *data, unsigned short size, int timeout)
+{
+	struct usb_host *host = dev->host;
+
+	if ((timeout == 0) && (!asynch_allowed)) {
+		/* request for a asynch control pipe is not allowed */
+		return -1;
+	}
+
+	/* set setup command */
+	setup_packet.requesttype = requesttype;
+	setup_packet.request = request;
+	setup_packet.value = cpu_to_le16(value);
+	setup_packet.index = cpu_to_le16(index);
+	setup_packet.length = cpu_to_le16(size);
+	USB_PRINTF("usb_control_msg: request: 0x%X, requesttype: 0x%X, " \
+		   "value 0x%X index 0x%X length 0x%X\n",
+		   request, requesttype, value, index, size);
+	dev->status = USB_ST_NOT_PROC; /*not yet processed */
+
+	host->submit_control_msg(dev, pipe, data, size, &setup_packet);
+	if (timeout == 0)
+		return (int)size;
+
+	if (dev->status != 0) {
+		/*
+		 * Let's wait a while for the timeout to elapse.
+		 * It has no real use, but it keeps the interface happy.
+		 */
+		wait_ms(timeout);
+		return -1;
+	}
+
+	return dev->act_len;
+}
+
+/*-------------------------------------------------------------------
+ * submits bulk message, and waits for completion. returns 0 if Ok or
+ * -1 if Error.
+ * synchronous behavior
+ */
+int usb_bulk_msg(struct usb_device *dev, unsigned int pipe,
+			void *data, int len, int *actual_length, int timeout)
+{
+	struct usb_host *host = dev->host;
+
+	if (len < 0)
+		return -1;
+	dev->status = USB_ST_NOT_PROC; /*not yet processed */
+	host->submit_bulk_msg(dev, pipe, data, len);
+	while (timeout--) {
+		if (!((volatile unsigned long)dev->status & USB_ST_NOT_PROC))
+			break;
+		wait_ms(1);
+	}
+	*actual_length = dev->act_len;
+	if (dev->status == 0)
+		return 0;
+	else
+		return -1;
+}
+
+
+/*-------------------------------------------------------------------
+ * Max Packet stuff
+ */
+
+/*
+ * returns the max packet size, depending on the pipe direction and
+ * the configurations values
+ */
+int usb_maxpacket(struct usb_device *dev, unsigned long pipe)
+{
+	/* direction is out -> use emaxpacket out */
+	if ((pipe & USB_DIR_IN) == 0)
+		return dev->epmaxpacketout[((pipe>>15) & 0xf)];
+	else
+		return dev->epmaxpacketin[((pipe>>15) & 0xf)];
+}
+
 /***********************************************************************
  * Clears an endpoint
  * endp: endpoint number in bits 0-3;
@@ -403,21 +644,6 @@ int usb_clear_halt(struct usb_device *dev, int pipe)
 	return 0;
 }
 
-
-/**********************************************************************
- * get_descriptor type
- */
-int usb_get_descriptor(struct usb_device *dev, unsigned char type,
-			unsigned char index, void *buf, int size)
-{
-	int res;
-	res = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
-			USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,
-			(type << 8) + index, 0,
-			buf, size, USB_CNTL_TIMEOUT);
-	return res;
-}
-
 /**********************************************************************
  * gets configuration cfgno and store it in the buffer
  */
@@ -455,22 +681,6 @@ int usb_get_configuration_no(struct usb_device *dev,
 }
 
 /********************************************************************
- * set address of a device to the value in dev->devnum.
- * This can only be done by addressing the device via the default address (0)
- */
-int usb_set_address(struct usb_device *dev)
-{
-	int res;
-
-	USB_PRINTF("set address %d\n", dev->devnum);
-	res = usb_control_msg(dev, usb_snddefctrl(dev),
-				USB_REQ_SET_ADDRESS, 0,
-				(dev->devnum), 0,
-				NULL, 0, USB_CNTL_TIMEOUT);
-	return res;
-}
-
-/********************************************************************
  * set interface number to interface
  */
 int usb_set_interface(struct usb_device *dev, int interface, int alternate)
@@ -509,26 +719,6 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
 }
 
 /********************************************************************
- * set configuration number to configuration
- */
-int usb_set_configuration(struct usb_device *dev, int configuration)
-{
-	int res;
-	USB_PRINTF("set configuration %d\n", configuration);
-	/* set setup command */
-	res = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-				USB_REQ_SET_CONFIGURATION, 0,
-				configuration, 0,
-				NULL, 0, USB_CNTL_TIMEOUT);
-	if (res == 0) {
-		dev->toggle[0] = 0;
-		dev->toggle[1] = 0;
-		return 0;
-	} else
-		return -1;
-}
-
-/********************************************************************
  * set protocol to protocol
  */
 int usb_set_protocol(struct usb_device *dev, int ifnum, int protocol)
@@ -700,243 +890,6 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
 	return err;
 }
 
-
-/********************************************************************
- * USB device handling:
- * the USB device are static allocated [USB_MAX_DEVICE].
- */
-
-
-/* returns a pointer to the device with the index [index].
- * if the device is not assigned (dev->devnum==-1) returns NULL
- */
-struct usb_device *usb_get_dev_index(int index)
-{
-	if (usb_dev[index].devnum == -1)
-		return NULL;
-	else
-		return &usb_dev[index];
-}
-
-
-/* returns a pointer of a new device structure or NULL, if
- * no device struct is available
- */
-struct usb_device *usb_alloc_new_device(void)
-{
-	int i;
-	USB_PRINTF("New Device %d\n", dev_index);
-	if (dev_index == USB_MAX_DEVICE) {
-		printf("ERROR, too many USB Devices, max=%d\n", USB_MAX_DEVICE);
-		return NULL;
-	}
-	/* default Address is 0, real addresses start with 1 */
-	usb_dev[dev_index].devnum = dev_index + 1;
-	usb_dev[dev_index].maxchild = 0;
-	for (i = 0; i < USB_MAXCHILDREN; i++)
-		usb_dev[dev_index].children[i] = NULL;
-	usb_dev[dev_index].parent = NULL;
-	dev_index++;
-	return &usb_dev[dev_index - 1];
-}
-
-
-/*
- * By the time we get here, the device has gotten a new device ID
- * and is in the default state. We need to identify the thing and
- * get the ball rolling..
- *
- * Returns 0 for success, != 0 for error.
- */
-int usb_new_device(struct usb_device *dev)
-{
-	int addr, err;
-	int tmp;
-	unsigned char tmpbuf[USB_BUFSIZ];
-
-	/* We still haven't set the Address yet */
-	addr = dev->devnum;
-	dev->devnum = 0;
-
-#ifdef CONFIG_LEGACY_USB_INIT_SEQ
-	/* this is the old and known way of initializing devices, it is
-	 * different than what Windows and Linux are doing. Windows and Linux
-	 * both retrieve 64 bytes while reading the device descriptor
-	 * Several USB stick devices report ERR: CTL_TIMEOUT, caused by an
-	 * invalid header while reading 8 bytes as device descriptor. */
-	dev->descriptor.bMaxPacketSize0 = 8;	    /* Start off at 8 bytes  */
-	dev->maxpacketsize = PACKET_SIZE_8;
-	dev->epmaxpacketin[0] = 8;
-	dev->epmaxpacketout[0] = 8;
-
-	err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, &dev->descriptor, 8);
-	if (err < 8) {
-		printf("\n      USB device not responding, " \
-		       "giving up (status=%lX)\n", dev->status);
-		return 1;
-	}
-#else
-	/* This is a Windows scheme of initialization sequence, with double
-	 * reset of the device (Linux uses the same sequence)
-	 * Some equipment is said to work only with such init sequence; this
-	 * patch is based on the work by Alan Stern:
-	 * http://sourceforge.net/mailarchive/forum.php?
-	 * thread_id=5729457&forum_id=5398
-	 */
-	struct usb_device_descriptor *desc;
-	int port = -1;
-	struct usb_device *parent = dev->parent;
-	unsigned short portstatus;
-
-	/* send 64-byte GET-DEVICE-DESCRIPTOR request.  Since the descriptor is
-	 * only 18 bytes long, this will terminate with a short packet.  But if
-	 * the maxpacket size is 8 or 16 the device may be waiting to transmit
-	 * some more, or keeps on retransmitting the 8 byte header. */
-
-	desc = (struct usb_device_descriptor *)tmpbuf;
-	dev->descriptor.bMaxPacketSize0 = 64;	    /* Start off at 64 bytes  */
-	/* Default to 64 byte max packet size */
-	dev->maxpacketsize = PACKET_SIZE_64;
-	dev->epmaxpacketin[0] = 64;
-	dev->epmaxpacketout[0] = 64;
-
-	err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, desc, 64);
-	if (err < 0) {
-		USB_PRINTF("usb_new_device: usb_get_descriptor() failed\n");
-		return 1;
-	}
-
-	dev->descriptor.bMaxPacketSize0 = desc->bMaxPacketSize0;
-
-	/* find the port number we're at */
-	if (parent) {
-		int j;
-
-		for (j = 0; j < parent->maxchild; j++) {
-			if (parent->children[j] == dev) {
-				port = j;
-				break;
-			}
-		}
-		if (port < 0) {
-			printf("usb_new_device:cannot locate device's port.\n");
-			return 1;
-		}
-
-		/* reset the port for the second time */
-		err = hub_port_reset(dev->parent, port, &portstatus);
-		if (err < 0) {
-			printf("\n     Couldn't reset port %i\n", port);
-			return 1;
-		}
-	}
-#endif
-
-	dev->epmaxpacketin[0] = dev->descriptor.bMaxPacketSize0;
-	dev->epmaxpacketout[0] = dev->descriptor.bMaxPacketSize0;
-	switch (dev->descriptor.bMaxPacketSize0) {
-	case 8:
-		dev->maxpacketsize  = PACKET_SIZE_8;
-		break;
-	case 16:
-		dev->maxpacketsize = PACKET_SIZE_16;
-		break;
-	case 32:
-		dev->maxpacketsize = PACKET_SIZE_32;
-		break;
-	case 64:
-		dev->maxpacketsize = PACKET_SIZE_64;
-		break;
-	}
-	dev->devnum = addr;
-
-	err = usb_set_address(dev); /* set address */
-
-	if (err < 0) {
-		printf("\n      USB device not accepting new address " \
-			"(error=%lX)\n", dev->status);
-		return 1;
-	}
-
-	wait_ms(10);	/* Let the SET_ADDRESS settle */
-
-	tmp = sizeof(dev->descriptor);
-
-	err = usb_get_descriptor(dev, USB_DT_DEVICE, 0,
-				 &dev->descriptor, sizeof(dev->descriptor));
-	if (err < tmp) {
-		if (err < 0)
-			printf("unable to get device descriptor (error=%d)\n",
-			       err);
-		else
-			printf("USB device descriptor short read " \
-				"(expected %i, got %i)\n", tmp, err);
-		return 1;
-	}
-	/* correct le values */
-	le16_to_cpus(&dev->descriptor.bcdUSB);
-	le16_to_cpus(&dev->descriptor.idVendor);
-	le16_to_cpus(&dev->descriptor.idProduct);
-	le16_to_cpus(&dev->descriptor.bcdDevice);
-	/* only support for one config for now */
-	usb_get_configuration_no(dev, &tmpbuf[0], 0);
-	usb_parse_config(dev, &tmpbuf[0], 0);
-	usb_set_maxpacket(dev);
-	/* we set the default configuration here */
-	if (usb_set_configuration(dev, dev->config.bConfigurationValue)) {
-		printf("failed to set default configuration " \
-			"len %d, status %lX\n", dev->act_len, dev->status);
-		return -1;
-	}
-	USB_PRINTF("new device strings: Mfr=%d, Product=%d, SerialNumber=%d\n",
-		   dev->descriptor.iManufacturer, dev->descriptor.iProduct,
-		   dev->descriptor.iSerialNumber);
-	memset(dev->mf, 0, sizeof(dev->mf));
-	memset(dev->prod, 0, sizeof(dev->prod));
-	memset(dev->serial, 0, sizeof(dev->serial));
-	if (dev->descriptor.iManufacturer)
-		usb_string(dev, dev->descriptor.iManufacturer,
-			   dev->mf, sizeof(dev->mf));
-	if (dev->descriptor.iProduct)
-		usb_string(dev, dev->descriptor.iProduct,
-			   dev->prod, sizeof(dev->prod));
-	if (dev->descriptor.iSerialNumber)
-		usb_string(dev, dev->descriptor.iSerialNumber,
-			   dev->serial, sizeof(dev->serial));
-	USB_PRINTF("Manufacturer %s\n", dev->mf);
-	USB_PRINTF("Product      %s\n", dev->prod);
-	USB_PRINTF("SerialNumber %s\n", dev->serial);
-	/* now prode if the device is a hub */
-	usb_hub_probe(dev, 0);
-	return 0;
-}
-
-/* build device Tree  */
-void usb_scan_devices(void)
-{
-	int i;
-	struct usb_device *dev;
-
-	/* first make all devices unknown */
-	for (i = 0; i < USB_MAX_DEVICE; i++) {
-		memset(&usb_dev[i], 0, sizeof(struct usb_device));
-		usb_dev[i].devnum = -1;
-	}
-	dev_index = 0;
-	/* device 0 is always present (root hub, so let it analyze) */
-	dev = usb_alloc_new_device();
-	if (usb_new_device(dev))
-		printf("No USB Device found\n");
-	else
-		printf("%d USB Device(s) found\n", dev_index);
-	/* insert "driver" if possible */
-#ifdef CONFIG_USB_KEYBOARD
-	drv_usb_kbd_init();
-	USB_PRINTF("scan end\n");
-#endif
-}
-
-
 /****************************************************************************
  * HUB "Driver"
  * Probes device for being a hub and configurate it
@@ -950,11 +903,6 @@ void usb_scan_devices(void)
 #define USB_HUB_PRINTF(fmt, args...)
 #endif
 
-
-static struct usb_hub_device hub_dev[USB_MAX_HUB];
-static int usb_hub_index;
-
-
 int usb_get_hub_descriptor(struct usb_device *dev, void *data, int size)
 {
 	return usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
@@ -1013,20 +961,6 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
 	}
 }
 
-void usb_hub_reset(void)
-{
-	usb_hub_index = 0;
-}
-
-struct usb_hub_device *usb_hub_allocate(void)
-{
-	if (usb_hub_index < USB_MAX_HUB)
-		return &hub_dev[usb_hub_index++];
-
-	printf("ERROR: USB_MAX_HUB (%d) reached\n", USB_MAX_HUB);
-	return NULL;
-}
-
 #define MAX_TRIES 5
 
 static inline char *portspeed(int portstatus)
@@ -1093,7 +1027,7 @@ static int hub_port_reset(struct usb_device *dev, int port,
 }
 
 
-void usb_hub_port_connect_change(struct usb_device *dev, int port)
+static void usb_hub_port_connect_change(struct usb_device *dev, int port)
 {
 	struct usb_device *usb;
 	struct usb_port_status portsts;
@@ -1133,6 +1067,7 @@ void usb_hub_port_connect_change(struct usb_device *dev, int port)
 
 	/* Allocate a new device struct for it */
 	usb = usb_alloc_new_device();
+	usb->host = dev->host;
 
 	if (portstatus & USB_PORT_STAT_HIGH_SPEED)
 		usb->speed = USB_SPEED_HIGH;
@@ -1160,15 +1095,14 @@ int usb_hub_configure(struct usb_device *dev)
 	int i;
 	struct usb_hub_device *hub;
 
-	/* "allocate" Hub device */
-	hub = usb_hub_allocate();
-	if (hub == NULL)
-		return -1;
+	hub = xzalloc(sizeof (*hub));
+	dev->hub = hub;
+
 	hub->pusb_dev = dev;
 	/* Get the the hub descriptor */
 	if (usb_get_hub_descriptor(dev, buffer, 4) < 0) {
-		USB_HUB_PRINTF("usb_hub_configure: failed to get hub " \
-				   "descriptor, giving up %lX\n", dev->status);
+		USB_HUB_PRINTF("%s: failed to get hub " \
+				   "descriptor, giving up %lX\n", __func__, dev->status);
 		return -1;
 	}
 	descriptor = (struct usb_hub_descriptor *)buffer;
@@ -1176,15 +1110,15 @@ int usb_hub_configure(struct usb_device *dev)
 	/* silence compiler warning if USB_BUFSIZ is > 256 [= sizeof(char)] */
 	i = descriptor->bLength;
 	if (i > USB_BUFSIZ) {
-		USB_HUB_PRINTF("usb_hub_configure: failed to get hub " \
-				"descriptor - too long: %d\n",
+		USB_HUB_PRINTF("%s: failed to get hub " \
+				"descriptor - too long: %d\n", __func__,
 				descriptor->bLength);
 		return -1;
 	}
 
 	if (usb_get_hub_descriptor(dev, buffer, descriptor->bLength) < 0) {
-		USB_HUB_PRINTF("usb_hub_configure: failed to get hub " \
-				"descriptor 2nd giving up %lX\n", dev->status);
+		USB_HUB_PRINTF("%s: failed to get hub " \
+				"descriptor 2nd giving up %lX\n", __func__, dev->status);
 		return -1;
 	}
 	memcpy((unsigned char *)&hub->desc, buffer, descriptor->bLength);
@@ -1249,13 +1183,13 @@ int usb_hub_configure(struct usb_device *dev)
 					   (1 << ((i + 1) % 8)) ? " not" : "");
 
 	if (sizeof(struct usb_hub_status) > USB_BUFSIZ) {
-		USB_HUB_PRINTF("usb_hub_configure: failed to get Status - " \
-				"too long: %d\n", descriptor->bLength);
+		USB_HUB_PRINTF("%s: failed to get Status - " \
+				"too long: %d\n", __func__, descriptor->bLength);
 		return -1;
 	}
 
 	if (usb_get_hub_status(dev, buffer) < 0) {
-		USB_HUB_PRINTF("usb_hub_configure: failed to get Status %lX\n",
+		USB_HUB_PRINTF("%s: failed to get Status %lX\n", __func__,
 				dev->status);
 		return -1;
 	}
@@ -1331,7 +1265,7 @@ int usb_hub_configure(struct usb_device *dev)
 	return 0;
 }
 
-int usb_hub_probe(struct usb_device *dev, int ifnum)
+static int usb_hub_probe(struct usb_device *dev, int ifnum)
 {
 	struct usb_interface_descriptor *iface;
 	struct usb_endpoint_descriptor *ep;
@@ -1362,4 +1296,102 @@ int usb_hub_probe(struct usb_device *dev, int ifnum)
 	return ret;
 }
 
-/* EOF */
+int usb_driver_register(struct usb_driver *drv)
+{
+	drv->driver.bus = &usb_bus_type;
+	return register_driver(&drv->driver);
+}
+
+/* returns 0 if no match, 1 if match */
+int usb_match_device(struct usb_device *dev, const struct usb_device_id *id)
+{
+	if ((id->match_flags & USB_DEVICE_ID_MATCH_VENDOR) &&
+	    id->idVendor != le16_to_cpu(dev->descriptor.idVendor))
+		return 0;
+
+	if ((id->match_flags & USB_DEVICE_ID_MATCH_PRODUCT) &&
+	    id->idProduct != le16_to_cpu(dev->descriptor.idProduct))
+		return 0;
+
+	return 1;
+}
+
+/* returns 0 if no match, 1 if match */
+int usb_match_one_id(struct usb_device *usbdev,
+		     const struct usb_device_id *id)
+{
+	/* proc_connectinfo in devio.c may call us with id == NULL. */
+	if (id == NULL)
+		return 0;
+
+	if (!usb_match_device(usbdev, id))
+		return 0;
+
+	return 1;
+}
+EXPORT_SYMBOL(usb_match_one_id);
+
+const struct usb_device_id *usb_match_id(struct usb_device *usbdev,
+					 const struct usb_device_id *id)
+{
+	/* proc_connectinfo in devio.c may call us with id == NULL. */
+	if (id == NULL)
+		return NULL;
+
+	/* It is important to check that id->driver_info is nonzero,
+	   since an entry that is all zeroes except for a nonzero
+	   id->driver_info is the way to create an entry that
+	   indicates that the driver want to examine every
+	   device and interface. */
+	for (; id->idVendor || id->idProduct || id->bDeviceClass ||
+	       id->bInterfaceClass || id->driver_info; id++) {
+		if (usb_match_one_id(usbdev, id))
+			return id;
+	}
+
+	return NULL;
+}
+EXPORT_SYMBOL(usb_match_id);
+
+static int usb_match(struct device_d *dev, struct driver_d *drv)
+{
+	struct usb_device *usbdev = container_of(dev, struct usb_device, dev);
+	struct usb_driver *usbdrv = container_of(dev->driver, struct usb_driver, driver);
+	const struct usb_device_id *id;
+
+	debug("matching: 0x%04x 0x%04x\n", usbdev->descriptor.idVendor, usbdev->descriptor.idProduct);
+
+	id = usb_match_id(usbdev, usbdrv->id_table);
+	if (id) {
+		debug("match: 0x%04x 0x%04x\n", id->idVendor, id->idProduct);
+		return 0;
+	}
+	return 1;
+}
+
+static int usb_probe(struct device_d *dev)
+{
+	struct usb_device *usbdev = container_of(dev, struct usb_device, dev);
+	struct usb_driver *usbdrv = container_of(dev->driver, struct usb_driver, driver);
+	const struct usb_device_id *id;
+
+	id = usb_match_id(usbdev, usbdrv->id_table);
+
+	return usbdrv->probe(usbdev, id);
+}
+
+static void usb_remove(struct device_d *dev)
+{
+	struct usb_device *usbdev = container_of(dev, struct usb_device, dev);
+	struct usb_driver *usbdrv = container_of(dev->driver, struct usb_driver, driver);
+
+	usbdrv->disconnect(usbdev);
+}
+
+struct bus_type usb_bus_type = {
+	.name	= "usb",
+	.match	= usb_match,
+	.probe	= usb_probe,
+	.remove	= usb_remove,
+};
+
diff --git a/drivers/usb/usb_ehci_core.c b/drivers/usb/usb_ehci_core.c
index deb9dd058f..590004c623 100644
--- a/drivers/usb/usb_ehci_core.c
+++ b/drivers/usb/usb_ehci_core.c
@@ -20,19 +20,30 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
  */
+/*#define DEBUG */
 #include <common.h>
 #include <asm/byteorder.h>
-#include <usb.h>
+#include <usb/usb.h>
 #include <asm/io.h>
 #include <malloc.h>
+#include <driver.h>
+#include <init.h>
+#include <xfuncs.h>
+#include <clock.h>
+
 #include "usb_ehci.h"
 
-int rootdev;
-struct ehci_hccr *hccr;	/* R/O registers, not need for volatile */
-volatile struct ehci_hcor *hcor;
+struct ehci_priv {
+	int rootdev;
+	struct ehci_hccr *hccr;
+	struct ehci_hcor *hcor;
+	struct usb_host host;
+	struct QH *qh_list;
+	void *qhp;
+	int portreset;
+};
 
-static uint16_t portreset;
-static struct QH qh_list __attribute__((aligned(32)));
+#define to_ehci(ptr) container_of(ptr, struct ehci_priv, host)
 
 static struct descriptor {
 	struct usb_hub_descriptor hub;
@@ -99,6 +110,7 @@ static struct descriptor {
 		255		/* bInterval */
 	},
 };
+#define CONFIG_EHCI_IS_TDI // FIXME
 
 #if defined(CONFIG_EHCI_IS_TDI)
 #define ehci_is_TDI()	(1)
@@ -146,6 +158,7 @@ static void cache_qh(struct QH *qh, int flush)
 	 * Walk the QH list and flush/invalidate all entries
 	 */
 	while (1) {
+		printf("huhu\n");
 		flush_invalidate((u32)qh_addr(qh), sizeof(struct QH), flush);
 		if ((u32)qh & QH_LINK_TYPE_QH)
 			break;
@@ -167,6 +180,7 @@ static void cache_qh(struct QH *qh, int flush)
 	 * Walk the qTD list and flush/invalidate all entries
 	 */
 	while (1) {
+		printf("haha\n");
 		if (qtd == NULL)
 			break;
 		cache_qtd(qtd, flush);
@@ -202,6 +216,7 @@ static inline void ehci_invalidate_dcache(struct QH *qh)
 static int handshake(uint32_t *ptr, uint32_t mask, uint32_t done, int usec)
 {
 	uint32_t result;
+
 	do {
 		result = ehci_readl(ptr);
 		if (result == ~(uint32_t)0)
@@ -220,24 +235,24 @@ static void ehci_free(void *p, size_t sz)
 
 }
 
-static int ehci_reset(void)
+static int ehci_reset(struct ehci_priv *ehci)
 {
 	uint32_t cmd;
 	uint32_t tmp;
 	uint32_t *reg_ptr;
 	int ret = 0;
 
-	cmd = ehci_readl(&hcor->or_usbcmd);
+	cmd = ehci_readl(&ehci->hcor->or_usbcmd);
 	cmd |= CMD_RESET;
-	ehci_writel(&hcor->or_usbcmd, cmd);
-	ret = handshake((uint32_t *)&hcor->or_usbcmd, CMD_RESET, 0, 250 * 1000);
+	ehci_writel(&ehci->hcor->or_usbcmd, cmd);
+	ret = handshake(&ehci->hcor->or_usbcmd, CMD_RESET, 0, 250 * 1000);
 	if (ret < 0) {
 		printf("EHCI fail to reset\n");
 		goto out;
 	}
 
 	if (ehci_is_TDI()) {
-		reg_ptr = (uint32_t *)((u8 *)hcor + USBMODE);
+		reg_ptr = (uint32_t *)((u8 *)&ehci->hcor + USBMODE);
 		tmp = ehci_readl(reg_ptr);
 		tmp |= USBMODE_CM_HC;
 #if defined(CONFIG_EHCI_MMIO_BIG_ENDIAN)
@@ -308,15 +323,17 @@ static int
 ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
 		   int length, struct devrequest *req)
 {
+	struct usb_host *host = dev->host;
+	struct ehci_priv *ehci = to_ehci(host);
 	struct QH *qh;
 	struct qTD *td;
 	volatile struct qTD *vtd;
-	unsigned long ts;
 	uint32_t *tdp;
 	uint32_t endpt, token, usbsts;
 	uint32_t c, toggle;
 	uint32_t cmd;
 	int ret = 0;
+	uint64_t start;
 
 	debug("dev=%p, pipe=%lx, buffer=%p, length=%d, req=%p\n", dev, pipe,
 	      buffer, length, req);
@@ -328,11 +345,12 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
 		      le16_to_cpu(req->index));
 
 	qh = ehci_alloc(sizeof(struct QH), 32);
-	if (qh == NULL) {
-		debug("unable to allocate QH\n");
+	if (!qh) {
+		printf("unable to allocate QH\n");
 		return -1;
 	}
-	qh->qh_link = cpu_to_hc32((uint32_t)&qh_list | QH_LINK_TYPE_QH);
+
+	qh->qh_link = cpu_to_hc32((uint32_t)ehci->qh_list | QH_LINK_TYPE_QH);
 	c = (usb_pipespeed(pipe) != USB_SPEED_HIGH &&
 	     usb_pipeendpoint(pipe) == 0) ? 1 : 0;
 	endpt = (8 << 28) |
@@ -359,8 +377,8 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
 
 	if (req != NULL) {
 		td = ehci_alloc(sizeof(struct qTD), 32);
-		if (td == NULL) {
-			debug("unable to allocate SETUP td\n");
+		if (!td) {
+			printf("unable to allocate SETUP td\n");
 			goto fail;
 		}
 		td->qt_next = cpu_to_hc32(QT_NEXT_TERMINATE);
@@ -376,13 +394,14 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
 		}
 		*tdp = cpu_to_hc32((uint32_t) td);
 		tdp = &td->qt_next;
+
 		toggle = 1;
 	}
 
 	if (length > 0 || req == NULL) {
 		td = ehci_alloc(sizeof(struct qTD), 32);
-		if (td == NULL) {
-			debug("unable to allocate DATA td\n");
+		if (!td) {
+			printf("unable to allocate DATA td\n");
 			goto fail;
 		}
 		td->qt_next = cpu_to_hc32(QT_NEXT_TERMINATE);
@@ -395,7 +414,7 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
 		    ((usb_pipein(pipe) ? 1 : 0) << 8) | (0x80 << 0);
 		td->qt_token = cpu_to_hc32(token);
 		if (ehci_td_buffer(td, buffer, length) != 0) {
-			debug("unable construct DATA td\n");
+			printf("unable construct DATA td\n");
 			ehci_free(td, sizeof(*td));
 			goto fail;
 		}
@@ -403,10 +422,10 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
 		tdp = &td->qt_next;
 	}
 
-	if (req != NULL) {
+	if (req) {
 		td = ehci_alloc(sizeof(struct qTD), 32);
-		if (td == NULL) {
-			debug("unable to allocate ACK td\n");
+		if (!td) {
+			printf("unable to allocate ACK td\n");
 			goto fail;
 		}
 		td->qt_next = cpu_to_hc32(QT_NEXT_TERMINATE);
@@ -418,56 +437,55 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
 		    (3 << 10) |
 		    ((usb_pipein(pipe) ? 0 : 1) << 8) | (0x80 << 0);
 		td->qt_token = cpu_to_hc32(token);
-		*tdp = cpu_to_hc32((uint32_t) td);
+		*tdp = cpu_to_hc32((uint32_t)td);
 		tdp = &td->qt_next;
 	}
 
-	qh_list.qh_link = cpu_to_hc32((uint32_t) qh | QH_LINK_TYPE_QH);
+	ehci->qh_list->qh_link = cpu_to_hc32((uint32_t) qh | QH_LINK_TYPE_QH);
 
 	/* Flush dcache */
-	ehci_flush_dcache(&qh_list);
+	ehci_flush_dcache(ehci->qh_list);
 
-	usbsts = ehci_readl(&hcor->or_usbsts);
-	ehci_writel(&hcor->or_usbsts, (usbsts & 0x3f));
+	usbsts = ehci_readl(&ehci->hcor->or_usbsts);
+	ehci_writel(&ehci->hcor->or_usbsts, (usbsts & 0x3f));
 
 	/* Enable async. schedule. */
-	cmd = ehci_readl(&hcor->or_usbcmd);
+	cmd = ehci_readl(&ehci->hcor->or_usbcmd);
 	cmd |= CMD_ASE;
-	ehci_writel(&hcor->or_usbcmd, cmd);
+	ehci_writel(&ehci->hcor->or_usbcmd, cmd);
 
-	ret = handshake((uint32_t *)&hcor->or_usbsts, STD_ASS, STD_ASS,
-			100 * 1000);
+	ret = handshake(&ehci->hcor->or_usbsts, STD_ASS, STD_ASS, 100 * 1000);
 	if (ret < 0) {
 		printf("EHCI fail timeout STD_ASS set\n");
 		goto fail;
 	}
-#if 0
+
 	/* Wait for TDs to be processed. */
-	ts = get_timer(0);
+	start = get_time_ns();
 	vtd = td;
 	do {
 		/* Invalidate dcache */
-		ehci_invalidate_dcache(&qh_list);
+		ehci_invalidate_dcache(ehci->qh_list);
 		token = hc32_to_cpu(vtd->qt_token);
-		if (!(token & 0x80))
+		if (is_timeout(start, SECOND)) {
+			printf("TD timeout\n");
 			break;
-	} while (get_timer(ts) < CONFIG_SYS_HZ);
-#else
-#warning FIXME
-#endif
+		}
+	} while (token & 0x80);
+
 	/* Disable async schedule. */
-	cmd = ehci_readl(&hcor->or_usbcmd);
+	cmd = ehci_readl(&ehci->hcor->or_usbcmd);
 	cmd &= ~CMD_ASE;
-	ehci_writel(&hcor->or_usbcmd, cmd);
+	ehci_writel(&ehci->hcor->or_usbcmd, cmd);
 
-	ret = handshake((uint32_t *)&hcor->or_usbsts, STD_ASS, 0,
+	ret = handshake(&ehci->hcor->or_usbsts, STD_ASS, 0,
 			100 * 1000);
 	if (ret < 0) {
 		printf("EHCI fail timeout STD_ASS reset\n");
 		goto fail;
 	}
 
-	qh_list.qh_link = cpu_to_hc32((uint32_t)&qh_list | QH_LINK_TYPE_QH);
+	ehci->qh_list->qh_link = cpu_to_hc32((uint32_t)ehci->qh_list | QH_LINK_TYPE_QH);
 
 	token = hc32_to_cpu(qh->qh_overlay.qt_token);
 	if (!(token & 0x80)) {
@@ -498,14 +516,15 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
 	} else {
 		dev->act_len = 0;
 		debug("dev=%u, usbsts=%#x, p[1]=%#x, p[2]=%#x\n",
-		      dev->devnum, ehci_readl(&hcor->or_usbsts),
-		      ehci_readl(&hcor->or_portsc[0]),
-		      ehci_readl(&hcor->or_portsc[1]));
+		      dev->devnum, ehci_readl(&ehci->hcor->or_usbsts),
+		      ehci_readl(&ehci->hcor->or_portsc[0]),
+		      ehci_readl(&ehci->hcor->or_portsc[1]));
 	}
 
 	return (dev->status != USB_ST_NOT_PROC) ? 0 : -1;
 
 fail:
+	printf("fail1\n");
 	td = (void *)hc32_to_cpu(qh->qh_overlay.qt_next);
 	while (td != (void *)QT_NEXT_TERMINATE) {
 		qh->qh_overlay.qt_next = td->qt_next;
@@ -530,6 +549,8 @@ int
 ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 		 int length, struct devrequest *req)
 {
+	struct usb_host *host = dev->host;
+	struct ehci_priv *ehci = to_ehci(host);
 	uint8_t tmpbuf[4];
 	u16 typeReq;
 	void *srcptr = NULL;
@@ -542,8 +563,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 			le16_to_cpu(req->index) - 1);
 		return -1;
 	}
-	status_reg = (uint32_t *)&hcor->or_portsc[
-						le16_to_cpu(req->index) - 1];
+	status_reg = (uint32_t *)&ehci->hcor->or_portsc[le16_to_cpu(req->index) - 1];
 	srclen = 0;
 
 	debug("req=%u (%#x), type=%u (%#x), value=%u, index=%u\n",
@@ -551,9 +571,9 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 	      req->requesttype, req->requesttype,
 	      le16_to_cpu(req->value), le16_to_cpu(req->index));
 
-	typeReq = req->request << 8 | req->requesttype;
+	typeReq = req->request | (req->requesttype << 8);
 
-	switch (le16_to_cpu(typeReq)) {
+	switch (typeReq) {
 	case DeviceRequest | USB_REQ_GET_DESCRIPTOR:
 		switch (le16_to_cpu(req->value) >> 8) {
 		case USB_DT_DEVICE:
@@ -594,7 +614,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 			goto unknown;
 		}
 		break;
-	case USB_REQ_GET_DESCRIPTOR | ((USB_DIR_IN | USB_RT_HUB) << 8):
+	case ((USB_DIR_IN | USB_RT_HUB) << 8) | USB_REQ_GET_DESCRIPTOR:
 		switch (le16_to_cpu(req->value) >> 8) {
 		case USB_DT_HUB:
 			debug("USB_DT_HUB config\n");
@@ -608,7 +628,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 		break;
 	case USB_REQ_SET_ADDRESS | (USB_RECIP_DEVICE << 8):
 		debug("USB_REQ_SET_ADDRESS\n");
-		rootdev = le16_to_cpu(req->value);
+		ehci->rootdev = le16_to_cpu(req->value);
 		break;
 	case DeviceOutRequest | USB_REQ_SET_CONFIGURATION:
 		debug("USB_REQ_SET_CONFIGURATION\n");
@@ -632,7 +652,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 		if (reg & EHCI_PS_OCA)
 			tmpbuf[0] |= USB_PORT_STAT_OVERCURRENT;
 		if (reg & EHCI_PS_PR &&
-		    (portreset & (1 << le16_to_cpu(req->index)))) {
+		    (ehci->portreset & (1 << le16_to_cpu(req->index)))) {
 			int ret;
 			/* force reset to complete */
 			reg = reg & ~(EHCI_PS_PR | EHCI_PS_CLEAR);
@@ -669,7 +689,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 			tmpbuf[2] |= USB_PORT_STAT_C_ENABLE;
 		if (reg & EHCI_PS_OCC)
 			tmpbuf[2] |= USB_PORT_STAT_C_OVERCURRENT;
-		if (portreset & (1 << le16_to_cpu(req->index)))
+		if (ehci->portreset & (1 << le16_to_cpu(req->index)))
 			tmpbuf[2] |= USB_PORT_STAT_C_RESET;
 
 		srcptr = tmpbuf;
@@ -684,7 +704,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 			ehci_writel(status_reg, reg);
 			break;
 		case USB_PORT_FEAT_POWER:
-			if (HCS_PPC(ehci_readl(&hccr->cr_hcsparams))) {
+			if (HCS_PPC(ehci_readl(&ehci->hccr->cr_hcsparams))) {
 				reg |= EHCI_PS_PP;
 				ehci_writel(status_reg, reg);
 			}
@@ -709,7 +729,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 				 * root
 				 */
 				wait_ms(50);
-				portreset |= 1 << le16_to_cpu(req->index);
+				ehci->portreset |= 1 << le16_to_cpu(req->index);
 			}
 			break;
 		default:
@@ -717,7 +737,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 			goto unknown;
 		}
 		/* unblock posted writes */
-		ehci_readl(&hcor->or_usbcmd);
+		ehci_readl(&ehci->hcor->or_usbcmd);
 		break;
 	case USB_REQ_CLEAR_FEATURE | ((USB_DIR_OUT | USB_RT_PORT) << 8):
 		reg = ehci_readl(status_reg);
@@ -729,7 +749,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 			reg = (reg & ~EHCI_PS_CLEAR) | EHCI_PS_PE;
 			break;
 		case USB_PORT_FEAT_POWER:
-			if (HCS_PPC(ehci_readl(&hccr->cr_hcsparams)))
+			if (HCS_PPC(ehci_readl(&ehci->hccr->cr_hcsparams)))
 				reg = reg & ~(EHCI_PS_CLEAR | EHCI_PS_PP);
 		case USB_PORT_FEAT_C_CONNECTION:
 			reg = (reg & ~EHCI_PS_CLEAR) | EHCI_PS_CSC;
@@ -738,7 +758,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 			reg = (reg & ~EHCI_PS_CLEAR) | EHCI_PS_OCC;
 			break;
 		case USB_PORT_FEAT_C_RESET:
-			portreset &= ~(1 << le16_to_cpu(req->index));
+			ehci->portreset &= ~(1 << le16_to_cpu(req->index));
 			break;
 		default:
 			debug("unknown feature %x\n", le16_to_cpu(req->value));
@@ -746,7 +766,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
 		}
 		ehci_writel(status_reg, reg);
 		/* unblock posted write */
-		ehci_readl(&hcor->or_usbcmd);
+		ehci_readl(&ehci->hcor->or_usbcmd);
 		break;
 	default:
 		debug("Unknown request\n");
@@ -774,21 +794,14 @@ unknown:
 	return -1;
 }
 
-int usb_lowlevel_stop(void)
-{
-	return ehci_hcd_stop();
-}
-
-int usb_lowlevel_init(void)
+static int ehci_init(struct usb_host *host)
 {
+	struct ehci_priv *ehci = to_ehci(host);
 	uint32_t reg;
 	uint32_t cmd;
 
-	if (ehci_hcd_init() != 0)
-		return -1;
-
 	/* EHCI spec section 4.1 */
-	if (ehci_reset() != 0)
+	if (ehci_reset(ehci) != 0)
 		return -1;
 
 #if defined(CONFIG_EHCI_HCD_INIT_AFTER_RESET)
@@ -797,20 +810,22 @@ int usb_lowlevel_init(void)
 #endif
 
 	/* Set head of reclaim list */
-	memset(&qh_list, 0, sizeof(qh_list));
-	qh_list.qh_link = cpu_to_hc32((uint32_t)&qh_list | QH_LINK_TYPE_QH);
-	qh_list.qh_endpt1 = cpu_to_hc32((1 << 15) | (USB_SPEED_HIGH << 12));
-	qh_list.qh_curtd = cpu_to_hc32(QT_NEXT_TERMINATE);
-	qh_list.qh_overlay.qt_next = cpu_to_hc32(QT_NEXT_TERMINATE);
-	qh_list.qh_overlay.qt_altnext = cpu_to_hc32(QT_NEXT_TERMINATE);
-	qh_list.qh_overlay.qt_token = cpu_to_hc32(0x40);
+	ehci->qhp = xzalloc(sizeof(struct QH) + 32);
+	ehci->qh_list = (struct QH *)(((unsigned long)ehci->qhp + 32) & ~31);
+
+	ehci->qh_list->qh_link = cpu_to_hc32((uint32_t)ehci->qh_list | QH_LINK_TYPE_QH);
+	ehci->qh_list->qh_endpt1 = cpu_to_hc32((1 << 15) | (USB_SPEED_HIGH << 12));
+	ehci->qh_list->qh_curtd = cpu_to_hc32(QT_NEXT_TERMINATE);
+	ehci->qh_list->qh_overlay.qt_next = cpu_to_hc32(QT_NEXT_TERMINATE);
+	ehci->qh_list->qh_overlay.qt_altnext = cpu_to_hc32(QT_NEXT_TERMINATE);
+	ehci->qh_list->qh_overlay.qt_token = cpu_to_hc32(0x40);
 
 	/* Set async. queue head pointer. */
-	ehci_writel(&hcor->or_asynclistaddr, (uint32_t)&qh_list);
+	ehci_writel(&ehci->hcor->or_asynclistaddr, (uint32_t)ehci->qh_list);
 
-	reg = ehci_readl(&hccr->cr_hcsparams);
+	reg = ehci_readl(&ehci->hccr->cr_hcsparams);
 	descriptor.hub.bNbrPorts = HCS_N_PORTS(reg);
-	printf("Register %x NbrPorts %d\n", reg, descriptor.hub.bNbrPorts);
+
 	/* Port Indicators */
 	if (HCS_INDICATOR(reg))
 		descriptor.hub.wHubCharacteristics |= 0x80;
@@ -819,31 +834,29 @@ int usb_lowlevel_init(void)
 		descriptor.hub.wHubCharacteristics |= 0x01;
 
 	/* Start the host controller. */
-	cmd = ehci_readl(&hcor->or_usbcmd);
+	cmd = ehci_readl(&ehci->hcor->or_usbcmd);
 	/*
 	 * Philips, Intel, and maybe others need CMD_RUN before the
 	 * root hub will detect new devices (why?); NEC doesn't
 	 */
 	cmd &= ~(CMD_LRESET|CMD_IAAD|CMD_PSE|CMD_ASE|CMD_RESET);
 	cmd |= CMD_RUN;
-	ehci_writel(&hcor->or_usbcmd, cmd);
+	ehci_writel(&ehci->hcor->or_usbcmd, cmd);
 
 	/* take control over the ports */
-	cmd = ehci_readl(&hcor->or_configflag);
+	cmd = ehci_readl(&ehci->hcor->or_configflag);
 	cmd |= FLAG_CF;
-	ehci_writel(&hcor->or_configflag, cmd);
+	ehci_writel(&ehci->hcor->or_configflag, cmd);
 	/* unblock posted write */
-	cmd = ehci_readl(&hcor->or_usbcmd);
+	cmd = ehci_readl(&ehci->hcor->or_usbcmd);
 	wait_ms(5);
-	reg = HC_VERSION(ehci_readl(&hccr->cr_capbase));
-	printf("USB EHCI %x.%02x\n", reg >> 8, reg & 0xff);
 
-	rootdev = 0;
+	ehci->rootdev = 0;
 
 	return 0;
 }
 
-int
+static int
 submit_bulk_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
 		int length)
 {
@@ -855,30 +868,70 @@ submit_bulk_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
 	return ehci_submit_async(dev, pipe, buffer, length, NULL);
 }
 
-int
+static int
 submit_control_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
 		   int length, struct devrequest *setup)
 {
+	struct usb_host *host = dev->host;
+	struct ehci_priv *ehci = to_ehci(host);
 
 	if (usb_pipetype(pipe) != PIPE_CONTROL) {
 		debug("non-control pipe (type=%lu)", usb_pipetype(pipe));
 		return -1;
 	}
 
-	if (usb_pipedevice(pipe) == rootdev) {
-		if (rootdev == 0)
+	if (usb_pipedevice(pipe) == ehci->rootdev) {
+		if (ehci->rootdev == 0)
 			dev->speed = USB_SPEED_HIGH;
 		return ehci_submit_root(dev, pipe, buffer, length, setup);
 	}
 	return ehci_submit_async(dev, pipe, buffer, length, setup);
 }
 
-int
+static int
 submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
 	       int length, int interval)
 {
-
 	debug("dev=%p, pipe=%lu, buffer=%p, length=%d, interval=%d",
 	      dev, pipe, buffer, length, interval);
 	return -1;
 }
+
+static int ehci_probe(struct device_d *dev)
+{
+	struct usb_host *host;
+	struct ehci_priv *ehci;
+	uint32_t reg;
+
+	ehci = xmalloc(sizeof(struct ehci_priv));
+	host = &ehci->host;
+
+	host->init = ehci_init;
+	host->submit_int_msg = submit_int_msg;
+	host->submit_control_msg = submit_control_msg;
+	host->submit_bulk_msg = submit_bulk_msg;
+
+	ehci->hccr = (void *)(dev->map_base + 0x100);
+	ehci->hcor = (void *)(dev->map_base + 0x140);
+
+	usb_register_host(host);
+
+	reg = HC_VERSION(ehci_readl(&ehci->hccr->cr_capbase));
+	dev_info(dev, "USB EHCI %x.%02x\n", reg >> 8, reg & 0xff);
+
+	return 0;
+}
+
+static struct driver_d ehci_driver = {
+	.name  = "ehci",
+	.probe = ehci_probe,
+};
+
+static int ehcil_init(void)
+{
+	register_driver(&ehci_driver);
+	return 0;
+}
+
+device_initcall(ehcil_init);
+