diff options
| author | Tom Rini <[email protected]> | 2025-11-04 07:54:00 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-11-04 07:54:00 -0600 |
| commit | e5b9d92d408d181d5983f352792e1549f03c7e46 (patch) | |
| tree | efff3149beccc983150512d4e2f4b4d11e8e8ba2 | |
| parent | b4c3869292ea88a9753c65691e02a21e2264b181 (diff) | |
| parent | f0f23e0618dd4534a57f843105a2c1b3f4f44d22 (diff) | |
Merge branch 'master' of git://source.denx.de/u-boot-usb
| -rw-r--r-- | drivers/usb/musb-new/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/usb/musb-new/musb_core.c | 2 | ||||
| -rw-r--r-- | drivers/usb/musb-new/musb_gadget.c | 4 | ||||
| -rw-r--r-- | drivers/usb/musb-new/musb_host.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/musb-new/Kconfig b/drivers/usb/musb-new/Kconfig index 0e2b2b5fb85..f8daaddc657 100644 --- a/drivers/usb/musb-new/Kconfig +++ b/drivers/usb/musb-new/Kconfig @@ -40,6 +40,7 @@ config USB_MUSB_DA8XX config USB_MUSB_TI bool "Enable TI OTG USB controller" depends on AM33XX + select MISC if OF_CONTROL select USB_MUSB_DSPS help Say y here to enable support for the dual role high diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c index a14b127dc37..17ec0d3acbd 100644 --- a/drivers/usb/musb-new/musb_core.c +++ b/drivers/usb/musb-new/musb_core.c @@ -1954,7 +1954,7 @@ musb_init_controller(struct musb_hdrc_platform_data *plat, struct device *dev, /* The musb_platform_init() call: * - adjusts musb->mregs and musb->isr if needed, - * - may initialize an integrated tranceiver + * - may initialize an integrated transceiver * - initializes musb->xceiv, usually by otg_get_phy() * - stops powering VBUS * diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c index 08fac829ce7..7daff5850f1 100644 --- a/drivers/usb/musb-new/musb_gadget.c +++ b/drivers/usb/musb-new/musb_gadget.c @@ -728,7 +728,7 @@ static void rxstate(struct musb *musb, struct musb_request *req) * mode 0 only. So we do not get endpoint interrupts due to DMA * completion. We only get interrupts from DMA controller. * - * We could operate in DMA mode 1 if we knew the size of the tranfer + * We could operate in DMA mode 1 if we knew the size of the transfer * in advance. For mass storage class, request->length = what the host * sends, so that'd work. But for pretty much everything else, * request->length is routinely more than what the host sends. For @@ -1422,7 +1422,7 @@ done: } /* - * Set or clear the halt bit of an endpoint. A halted enpoint won't tx/rx any + * Set or clear the halt bit of an endpoint. A halted endpoint won't tx/rx any * data but will queue requests. * * exported to ep0 code diff --git a/drivers/usb/musb-new/musb_host.c b/drivers/usb/musb-new/musb_host.c index 7528a53d73e..7f296d15984 100644 --- a/drivers/usb/musb-new/musb_host.c +++ b/drivers/usb/musb-new/musb_host.c @@ -1862,7 +1862,7 @@ static int musb_schedule( head = &musb->out_bulk; /* Enable bulk RX NAK timeout scheme when bulk requests are - * multiplexed. This scheme doen't work in high speed to full + * multiplexed. This scheme doesn't work in high speed to full * speed scenario as NAK interrupts are not coming from a * full speed device connected to a high speed device. * NAK timeout interval is 8 (128 uframe or 16ms) for HS and |