Adjust the existing hub code to support driver model, and add a USB driver
for hubs.
Signed-off-by: Simon Glass s...@chromium.org
---
Changes in v2: None
common/usb_hub.c | 94 +++---
include/dm/uclass-id.h | 1 +
2 files changed, 91 insertions(+), 4 deletions(-)
diff --git a/common/usb_hub.c b/common/usb_hub.c
index cc22f4b..6933015 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -24,12 +24,16 @@
#include common.h
#include command.h
+#include dm.h
#include errno.h
#include asm/processor.h
#include asm/unaligned.h
#include linux/ctype.h
#include asm/byteorder.h
#include asm/unaligned.h
+#include dm/root.h
+
+DECLARE_GLOBAL_DATA_PTR;
#include usb.h
#ifdef CONFIG_4xx
@@ -38,6 +42,7 @@
#define USB_BUFSIZ 512
+/* TODO(s...@chromium.org): Remove this when CONFIG_DM_USB is defined */
static struct usb_hub_device hub_dev[USB_MAX_HUB];
static int usb_hub_index;
@@ -148,7 +153,12 @@ int legacy_hub_port_reset(struct usb_device *dev, int port,
ALLOC_CACHE_ALIGN_BUFFER(struct usb_port_status, portsts, 1);
unsigned short portstatus, portchange;
- debug(hub_port_reset: resetting port %d...\n, port);
+#ifdef CONFIG_DM_USB
+ debug(%s: resetting '%s' port %d...\n, __func__, dev-dev-name,
+ port + 1);
+#else
+ debug(%s: resetting port %d...\n, __func__, port + 1);
+#endif
for (tries = 0; tries MAX_TRIES; tries++) {
usb_set_port_feature(dev, port + 1, USB_PORT_FEAT_RESET);
@@ -206,10 +216,17 @@ int legacy_hub_port_reset(struct usb_device *dev, int
port,
return 0;
}
+#ifdef CONFIG_DM_USB
+int hub_port_reset(struct udevice *dev, int port, unsigned short *portstat)
+{
+ struct usb_device *udev = dev_get_parentdata(dev);
+
+ return legacy_hub_port_reset(udev, port, portstat);
+}
+#endif
int usb_hub_port_connect_change(struct usb_device *dev, int port)
{
- struct usb_device *usb;
ALLOC_CACHE_ALIGN_BUFFER(struct usb_port_status, portsts, 1);
unsigned short portstatus;
int ret, speed;
@@ -232,7 +249,8 @@ int usb_hub_port_connect_change(struct usb_device *dev, int
port)
/* Disconnect any existing devices under this port */
if (((!(portstatus USB_PORT_STAT_CONNECTION))
-(!(portstatus USB_PORT_STAT_ENABLE))) || (dev-children[port])) {
+(!(portstatus USB_PORT_STAT_ENABLE))) ||
+ usb_device_has_child_on_port(dev, port)) {
debug(usb_disconnect(hub-children[port]);\n);
/* Return now if nothing is connected */
if (!(portstatus USB_PORT_STAT_CONNECTION))
@@ -264,6 +282,13 @@ int usb_hub_port_connect_change(struct usb_device *dev,
int port)
break;
}
+#ifdef CONFIG_DM_USB
+ struct udevice *child;
+
+ ret = usb_scan_device(dev-dev, port + 1, speed, child);
+#else
+ struct usb_device *usb;
+
ret = usb_alloc_new_device(dev-controller, usb);
if (ret) {
printf(cannot create new device: ret=%d, ret);
@@ -280,6 +305,9 @@ int usb_hub_port_connect_change(struct usb_device *dev, int
port)
/* Woops, disable the port */
usb_free_device(dev-controller);
dev-children[port] = NULL;
+ }
+#endif
+ if (ret 0) {
debug(hub: disabling port %d\n, port + 1);
usb_clear_port_feature(dev, port + 1, USB_PORT_FEAT_ENABLE);
}
@@ -427,7 +455,11 @@ static int usb_hub_configure(struct usb_device *dev)
int ret;
ulong start = get_timer(0);
+#ifdef CONFIG_DM_USB
+ debug(\n\nScanning '%s' port %d\n, dev-dev-name, i + 1);
+#else
debug(\n\nScanning port %d\n, i + 1);
+#endif
/*
* Wait for (whichever finishes first)
* - A maximum of 10 seconds
@@ -477,7 +509,7 @@ static int usb_hub_configure(struct usb_device *dev)
* them again. Works at least with mouse driver */
if (!(portstatus USB_PORT_STAT_ENABLE)
(portstatus USB_PORT_STAT_CONNECTION)
-((dev-children[i]))) {
+usb_device_has_child_on_port(dev, i)) {
debug(already running port %i \
disabled by hub (EMI?), \
re-enabling...\n, i + 1);
@@ -558,3 +590,57 @@ int usb_hub_probe(struct usb_device *dev, int ifnum)
ret = usb_hub_configure(dev);
return ret;
}
+
+#ifdef CONFIG_DM_USB
+int usb_hub_scan(struct udevice *hub)
+{
+ struct usb_device *udev = dev_get_parentdata(hub);
+
+ return usb_hub_configure(udev);
+}
+
+static int usb_hub_post_bind(struct udevice *dev)
+{
+ /* Scan the bus for devices */
+ return dm_scan_fdt_node(dev,
