| Message ID | 20200124152504.23411-2-mans@mansr.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [RESEND,1/2] dt-bindings: usb: add non-removable-ports hub property | expand |
On Fri, Jan 24, 2020 at 03:25:04PM +0000, Mans Rullgard wrote: > Mark any ports listed in the non-removable-ports DT property as > hardwired. This is useful for boards with built-in USB devices > that cannot be (or have not been) marked as fixed in hardware. > > Signed-off-by: Mans Rullgard <mans@mansr.com> > --- > drivers/usb/core/hub.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c > index 4ac74b354801..97f8f15fb632 100644 > --- a/drivers/usb/core/hub.c > +++ b/drivers/usb/core/hub.c > @@ -1366,6 +1366,9 @@ static int hub_configure(struct usb_hub *hub, > unsigned unit_load; > unsigned full_load; > unsigned maxchild; > + struct property *prop; > + const __be32 *cur; > + u32 val; > > hub->buffer = kmalloc(sizeof(*hub->buffer), GFP_KERNEL); > if (!hub->buffer) { > @@ -1667,6 +1670,19 @@ static int hub_configure(struct usb_hub *hub, > } > } > > + of_property_for_each_u32(hub_dev->of_node, "non-removable-ports", > + prop, cur, val) { > + if (val < 1 || val > hdev->maxchild) { > + dev_warn(hub_dev, > + "bad port number %u in non-removable-ports\n", > + val); > + continue; > + } > + > + hub->ports[val - 1]->connect_type = > + USB_PORT_CONNECT_TYPE_HARD_WIRED; > + } > + Is this doing the same thing that ACPI does? It doesn't seem like it, why not do this in usb_hub_adjust_deviceremovable()? Or wherever ACPI does this... thanks, greg k-h
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 4ac74b354801..97f8f15fb632 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1366,6 +1366,9 @@ static int hub_configure(struct usb_hub *hub, unsigned unit_load; unsigned full_load; unsigned maxchild; + struct property *prop; + const __be32 *cur; + u32 val; hub->buffer = kmalloc(sizeof(*hub->buffer), GFP_KERNEL); if (!hub->buffer) { @@ -1667,6 +1670,19 @@ static int hub_configure(struct usb_hub *hub, } } + of_property_for_each_u32(hub_dev->of_node, "non-removable-ports", + prop, cur, val) { + if (val < 1 || val > hdev->maxchild) { + dev_warn(hub_dev, + "bad port number %u in non-removable-ports\n", + val); + continue; + } + + hub->ports[val - 1]->connect_type = + USB_PORT_CONNECT_TYPE_HARD_WIRED; + } + usb_hub_adjust_deviceremovable(hdev, hub->descriptor); hub_activate(hub, HUB_INIT);
Mark any ports listed in the non-removable-ports DT property as hardwired. This is useful for boards with built-in USB devices that cannot be (or have not been) marked as fixed in hardware. Signed-off-by: Mans Rullgard <mans@mansr.com> --- drivers/usb/core/hub.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)