Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge https://source.denx.de/u-boot/custodians/u-boot-usb

Browse source
This commit is contained in:
Tom Rini 2022-05-20 22:07:56 -04:00
commit 6f00b97d7e
4 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/usb/common/common.c
View file

@ -40,6 +40,22 @@ enum usb_dr_mode usb_get_dr_mode(ofnode node)
return USB_DR_MODE_UNKNOWN;
}
enum usb_dr_mode usb_get_role_switch_default_mode(ofnode node)
{
const char *dr_mode;
int i;
dr_mode = ofnode_read_string(node, "role-switch-default-mode");
if (!dr_mode)
return USB_DR_MODE_UNKNOWN;
for (i = 0; i < ARRAY_SIZE(usb_dr_modes); i++)
if (!strcmp(dr_mode, usb_dr_modes[i]))
return i;
return USB_DR_MODE_UNKNOWN;
}
static const char *const speed_names[] = {
[USB_SPEED_UNKNOWN] = "UNKNOWN",
[USB_SPEED_LOW] = "low-speed",

4
drivers/usb/dwc3/dwc3-generic.c
View file

@ -468,9 +468,11 @@ static int dwc3_glue_probe(struct udevice *dev)
ret = generic_phy_init(&phy);
if (ret)
return ret;
} else if (ret != -ENOENT) {
} else if (ret != -ENOENT && ret != -ENODATA) {
debug("could not get phy (err %d)\n", ret);
return ret;
} else {
phy.dev = NULL;
}
glue->regs = dev_read_addr(dev);

6
drivers/usb/host/xhci-dwc3.c
View file

@ -209,6 +209,12 @@ static int xhci_dwc3_probe(struct udevice *dev)
writel(reg, &dwc3_reg->g_usb2phycfg[0]);
dr_mode = usb_get_dr_mode(dev_ofnode(dev));
if (dr_mode == USB_DR_MODE_OTG &&
dev_read_bool(dev, "usb-role-switch")) {
dr_mode = usb_get_role_switch_default_mode(dev_ofnode(dev));
if (dr_mode == USB_DR_MODE_UNKNOWN)
dr_mode = USB_DR_MODE_OTG;
}
if (dr_mode == USB_DR_MODE_UNKNOWN)
/* by default set dual role mode to HOST */
dr_mode = USB_DR_MODE_HOST;

10
include/linux/usb/otg.h
View file

@ -27,6 +27,16 @@ enum usb_dr_mode {
*/
enum usb_dr_mode usb_get_dr_mode(ofnode node);
/**
* usb_get_dr_mode() - Get dual role mode for given device
* @node: ofnode of the given device
*
* The function gets phy interface string from property
* 'role-switch-defaulr-mode', and returns the correspondig enum
* usb_dr_mode
*/
enum usb_dr_mode usb_get_role_switch_default_mode(ofnode node);
/**
* usb_get_maximum_speed() - Get maximum speed for given device
* @node: ofnode of the given device