random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-17 09:18:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom Rini 2022-04-22 11:06:31 -04:00
commit 6d73175b1f
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/usb/dwc3/dwc3-generic.c
View File

@ -14,6 +14,7 @@
#include <dm/device-internal.h>
#include <dm/lists.h>
#include <dwc3-uboot.h>
#include <generic-phy.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/usb/ch9.h>
@ -460,6 +461,17 @@ static int dwc3_glue_probe(struct udevice *dev)
struct udevice *child = NULL;
int index = 0;
int ret;
struct phy phy;
ret = generic_phy_get_by_name(dev, "usb3-phy", &phy);
if (!ret) {
ret = generic_phy_init(&phy);
if (ret)
return ret;
} else if (ret != -ENOENT) {
debug("could not get phy (err %d)\n", ret);
return ret;
}
glue->regs = dev_read_addr(dev);
@ -471,6 +483,12 @@ static int dwc3_glue_probe(struct udevice *dev)
if (ret)
return ret;
if (phy.dev) {
ret = generic_phy_power_on(&phy);
if (ret)
return ret;
}
ret = device_find_first_child(dev, &child);
if (ret)
return ret;

2
drivers/usb/eth/r8152.c
View File

@ -48,6 +48,7 @@ static const struct r8152_dongle r8152_dongles[] = {
/* TP-LINK */
{ 0x2357, 0x0601 },
{ 0x2357, 0x0602 },
/* Nvidia */
{ 0x0955, 0x09ff },
@ -1885,6 +1886,7 @@ static const struct usb_device_id r8152_eth_id_table[] = {
/* TP-LINK */
{ USB_DEVICE(0x2357, 0x0601) },
{ USB_DEVICE(0x2357, 0x0602) },
/* Nvidia */
{ USB_DEVICE(0x0955, 0x09ff) },

4
drivers/usb/gadget/ci_udc.c
View File

@ -94,11 +94,11 @@ static struct usb_request *
ci_ep_alloc_request(struct usb_ep *ep, unsigned int gfp_flags);
static void ci_ep_free_request(struct usb_ep *ep, struct usb_request *_req);
static struct usb_gadget_ops ci_udc_ops = {
static const struct usb_gadget_ops ci_udc_ops = {
.pullup = ci_pullup,
};
static struct usb_ep_ops ci_ep_ops = {
static const struct usb_ep_ops ci_ep_ops = {
.enable = ci_ep_enable,
.disable = ci_ep_disable,
.queue = ci_ep_queue,

2
include/generic-phy.h
View File

@ -155,7 +155,7 @@ struct phy_bulk {
unsigned int count;
};
#ifdef CONFIG_PHY
#if CONFIG_IS_ENABLED(PHY)
/**
* generic_phy_init() - initialize the PHY port