mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: core: move root hub's device node assignment after it is added to bus

Browse source 
When the root hub device is added to the bus, it tries to get pins
information from pinctrl (see pinctrl_bind_pins, at really_probe), if
the pin information is described at DT, it will show below error since
the root hub's device node is the same with controller's, but controller's
pin has already been requested when it is added to platform bus.

	imx6q-pinctrl 20e0000.iomuxc: pin MX6Q_PAD_GPIO_1 already
       	requested by 2184000.usb; cannot claim for usb1
	imx6q-pinctrl 20e0000.iomuxc: pin-137 (usb1) status -22
	imx6q-pinctrl 20e0000.iomuxc: could not request pin 137
       	(MX6Q_PAD_GPIO_1) from group usbotggrp-3 on device 20e0000.iomuxc
	usb usb1: Error applying setting, reverse things back

To fix this issue, we move the root hub's device node assignment (equals
to contrller's) after device is added to bus, we only need to know root
hub's device node information after the device under root hub is created,
so this movement will not affect current function.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
Reported-by: Lars Steubesand <lars.steubesand@philips.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Chen 2016-04-25 09:57:18 +08:00 committed by Greg Kroah-Hartman
parent 49e8eccf37
commit dc5878abf4
2 changed files with 1 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/usb/core/hcd.c
View file

@ -1118,6 +1118,7 @@ static int register_root_hub(struct usb_hcd *hcd)
/* Did the HC die before the root hub was registered? */ /* Did the HC die before the root hub was registered? */
if (HCD_DEAD(hcd)) if (HCD_DEAD(hcd))
usb_hc_died (hcd); /* This time clean up */ usb_hc_died (hcd); /* This time clean up */
usb_dev->dev.of_node = parent_dev->of_node;
} }
mutex_unlock(&usb_bus_idr_lock); mutex_unlock(&usb_bus_idr_lock);

1
drivers/usb/core/usb.c
View file

@ -472,7 +472,6 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
dev->route = 0; dev->route = 0;
dev->dev.parent = bus->controller; dev->dev.parent = bus->controller;
dev->dev.of_node = bus->controller->of_node;
dev_set_name(&dev->dev, "usb%d", bus->busnum); dev_set_name(&dev->dev, "usb%d", bus->busnum);
root_hub = 1; root_hub = 1;
} else { } else {