diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-22 09:14:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-22 09:14:35 -0500 |
| commit | d792b63febf492a07a106245e46532c0d43a7ecd (patch) | |
| tree | 21d2cf87275d9129353adf3c5cbd3a1674c77499 | |
| parent | 1e104ac61f039537c7b683676414b7b7ededc1a8 (diff) | |
| parent | 5c207282f53f86ecbf8c25cb691030d8c643ba1c (diff) | |
| download | u-boot-WIP/22Dec2019.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-usbWIP/22Dec2019
- dwc3 and cdns3 bug fixes
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/usb/cdns3/ep0.c | 1 | ||||
| -rw-r--r-- | drivers/usb/dwc3/core.c | 12 | ||||
| -rw-r--r-- | drivers/usb/dwc3/core.h | 20 |
4 files changed, 19 insertions, 16 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8d588b7d64..438fb225ab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -883,6 +883,8 @@ M: Marek Vasut <marex@denx.de> S: Maintained T: git https://gitlab.denx.de/u-boot/custodians/u-boot-usb.git F: drivers/usb/ +F: common/usb.c +F: common/usb_kbd.c USB xHCI M: Bin Meng <bmeng.cn@gmail.com> diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/ep0.c index 1903f61103..0b6d9cf727 100644 --- a/drivers/usb/cdns3/ep0.c +++ b/drivers/usb/cdns3/ep0.c @@ -10,6 +10,7 @@ * Peter Chen <peter.chen@nxp.com> */ +#include <cpu_func.h> #include <linux/usb/composite.h> #include <linux/iopoll.h> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 0f9a632816..77c555e769 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -622,15 +622,19 @@ static void dwc3_uboot_hsphy_mode(struct dwc3_device *dwc3_dev, /* Set dwc3 usb2 phy config */ reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); - reg |= DWC3_GUSB2PHYCFG_PHYIF; - reg &= ~DWC3_GUSB2PHYCFG_USBTRDTIM_MASK; switch (hsphy_mode) { case USBPHY_INTERFACE_MODE_UTMI: - reg |= DWC3_GUSB2PHYCFG_USBTRDTIM_8BIT; + reg &= ~(DWC3_GUSB2PHYCFG_PHYIF_MASK | + DWC3_GUSB2PHYCFG_USBTRDTIM_MASK); + reg |= DWC3_GUSB2PHYCFG_PHYIF(UTMI_PHYIF_8_BIT) | + DWC3_GUSB2PHYCFG_USBTRDTIM(USBTRDTIM_UTMI_8_BIT); break; case USBPHY_INTERFACE_MODE_UTMIW: - reg |= DWC3_GUSB2PHYCFG_USBTRDTIM_16BIT; + reg &= ~(DWC3_GUSB2PHYCFG_PHYIF_MASK | + DWC3_GUSB2PHYCFG_USBTRDTIM_MASK); + reg |= DWC3_GUSB2PHYCFG_PHYIF(UTMI_PHYIF_16_BIT) | + DWC3_GUSB2PHYCFG_USBTRDTIM(USBTRDTIM_UTMI_16_BIT); break; default: break; diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index bff53e072b..1c08a2c5b6 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -162,18 +162,14 @@ /* Global USB2 PHY Configuration Register */ #define DWC3_GUSB2PHYCFG_PHYSOFTRST (1 << 31) #define DWC3_GUSB2PHYCFG_SUSPHY (1 << 6) -#define DWC3_GUSB2PHYCFG_PHYIF BIT(3) - -/* Global USB2 PHY Configuration Mask */ -#define DWC3_GUSB2PHYCFG_USBTRDTIM_MASK (0xf << 10) - -/* Global USB2 PHY Configuration Offset */ -#define DWC3_GUSB2PHYCFG_USBTRDTIM_OFFSET 10 - -#define DWC3_GUSB2PHYCFG_USBTRDTIM_16BIT (0x5 << \ - DWC3_GUSB2PHYCFG_USBTRDTIM_OFFSET) -#define DWC3_GUSB2PHYCFG_USBTRDTIM_8BIT (0x9 << \ - DWC3_GUSB2PHYCFG_USBTRDTIM_OFFSET) +#define DWC3_GUSB2PHYCFG_PHYIF(n) ((n) << 3) +#define DWC3_GUSB2PHYCFG_PHYIF_MASK DWC3_GUSB2PHYCFG_PHYIF(1) +#define DWC3_GUSB2PHYCFG_USBTRDTIM(n) ((n) << 10) +#define DWC3_GUSB2PHYCFG_USBTRDTIM_MASK DWC3_GUSB2PHYCFG_USBTRDTIM(0xf) +#define USBTRDTIM_UTMI_8_BIT 9 +#define USBTRDTIM_UTMI_16_BIT 5 +#define UTMI_PHYIF_16_BIT 1 +#define UTMI_PHYIF_8_BIT 0 /* Global USB3 PIPE Control Register */ #define DWC3_GUSB3PIPECTL_PHYSOFTRST (1 << 31) |