diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-05 18:18:00 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-05 18:18:00 -0400 |
| commit | 64dc9e2e7320f079b97c46b106133b58b8e18d40 (patch) | |
| tree | ab010dc1337d44e29c2b32b7f11788620a91fe4f /drivers/usb/musb/cppi_dma.c | |
| parent | 01a60e76b6392547ad3dca3ac05b9c886fa5da45 (diff) | |
| parent | 9b192de60b5a584ee4ed967fb6758773c75e4643 (diff) | |
Merge tag 'usb-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb: patches for v3.10 merge window
Here is the big Gadget & PHY pull request. Many of us have
been really busy lately getting multiple drivers to a better
position.
Since this pull request is so large, I will divide it in sections
so it's easier to grasp what's included.
- cleanups:
. UDC drivers no longer touch gadget->dev, that's now udc-core
responsibility
. Many more UDC drivers converted to usb_gadget_map/unmap_request()
. UDC drivers no longer initialize DMA-related fields from gadget's
device structure
. UDC drivers don't touch gadget.dev.driver directly
. UDC drivers don't assign gadget.dev.release directly
. Removal of some unused DMA_ADDR_INVALID
. Introduction of CONFIG_USB_PHY
. All phy drivers have been moved to drivers/usb/phy and renamed to
a common naming scheme
. Fix PHY layer so it never returns a NULL pointer, also fix all
callers to avoid using IS_ERR_OR_NULL()
. Sparse fixes all over the place
. drivers/usb/otg/ has been deleted
. Marvel drivers (mv_udc, ehci-mv, mv_otg and mv_u3d) improved clock
usage
- new features:
. UDC core now provides a generic way for tracking and reporting
UDC's state (not attached, resuming, suspended, addressed,
default, etc)
. twl4030-usb learned that it shouldn't be enabled during init
. Full DT support for DWC3 has been implemented
. ab8500-usb learned about pinctrl framework
. nop PHY learned about DeviceTree and regulators
. DWC3 learned about suspend/resume
. DWC3 can now be compiled in host-only and gadget-only (as well as
DRD) configurations
. UVC now enables streaming endpoint based on negotiated speed
. isp1301 now implements the PHY API properly
. configfs-based interface for gadget drivers which will lead to
the removal of all code which just combines functions together
to build functional gadget drivers.
. f_serial and f_obex were converted to new configfs interface while
maintaining old interface around.
- non-critical fixes:
. UVC gadget driver got fixes for Endpoint usage and stream calculation
. ab8500-usb fixed unbalanced clock and regulator API usage
. twl4030-usb got a fix for when OMAP3 is booted with cable connected
. fusb300_udc got a fix for DMA usage
. UVC got fixes for two assertions of the USB Video Class Compliance
specification revision 1.1
. build warning issues caused by recent addition of __must_check to
regulator API
These are all changes which deserve a mention, all other changes are related
to these one or minor spelling fixes and other similar tasks.
Signed-of-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/cppi_dma.c')
| -rw-r--r-- | drivers/usb/musb/cppi_dma.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c index f522000e8f06..9db211ee15b5 100644 --- a/drivers/usb/musb/cppi_dma.c +++ b/drivers/usb/musb/cppi_dma.c | |||
| @@ -435,7 +435,6 @@ cppi_rndis_update(struct cppi_channel *c, int is_rx, | |||
| 435 | } | 435 | } |
| 436 | } | 436 | } |
| 437 | 437 | ||
| 438 | #ifdef CONFIG_USB_MUSB_DEBUG | ||
| 439 | static void cppi_dump_rxbd(const char *tag, struct cppi_descriptor *bd) | 438 | static void cppi_dump_rxbd(const char *tag, struct cppi_descriptor *bd) |
| 440 | { | 439 | { |
| 441 | pr_debug("RXBD/%s %08x: " | 440 | pr_debug("RXBD/%s %08x: " |
| @@ -444,21 +443,16 @@ static void cppi_dump_rxbd(const char *tag, struct cppi_descriptor *bd) | |||
| 444 | bd->hw_next, bd->hw_bufp, bd->hw_off_len, | 443 | bd->hw_next, bd->hw_bufp, bd->hw_off_len, |
| 445 | bd->hw_options); | 444 | bd->hw_options); |
| 446 | } | 445 | } |
| 447 | #endif | ||
| 448 | 446 | ||
| 449 | static void cppi_dump_rxq(int level, const char *tag, struct cppi_channel *rx) | 447 | static void cppi_dump_rxq(int level, const char *tag, struct cppi_channel *rx) |
| 450 | { | 448 | { |
| 451 | #ifdef CONFIG_USB_MUSB_DEBUG | ||
| 452 | struct cppi_descriptor *bd; | 449 | struct cppi_descriptor *bd; |
| 453 | 450 | ||
| 454 | if (!_dbg_level(level)) | ||
| 455 | return; | ||
| 456 | cppi_dump_rx(level, rx, tag); | 451 | cppi_dump_rx(level, rx, tag); |
| 457 | if (rx->last_processed) | 452 | if (rx->last_processed) |
| 458 | cppi_dump_rxbd("last", rx->last_processed); | 453 | cppi_dump_rxbd("last", rx->last_processed); |
| 459 | for (bd = rx->head; bd; bd = bd->next) | 454 | for (bd = rx->head; bd; bd = bd->next) |
| 460 | cppi_dump_rxbd("active", bd); | 455 | cppi_dump_rxbd("active", bd); |
| 461 | #endif | ||
| 462 | } | 456 | } |
| 463 | 457 | ||
| 464 | 458 | ||
| @@ -784,6 +778,7 @@ cppi_next_rx_segment(struct musb *musb, struct cppi_channel *rx, int onepacket) | |||
| 784 | void __iomem *tibase = musb->ctrl_base; | 778 | void __iomem *tibase = musb->ctrl_base; |
| 785 | int is_rndis = 0; | 779 | int is_rndis = 0; |
| 786 | struct cppi_rx_stateram __iomem *rx_ram = rx->state_ram; | 780 | struct cppi_rx_stateram __iomem *rx_ram = rx->state_ram; |
| 781 | struct cppi_descriptor *d; | ||
| 787 | 782 | ||
| 788 | if (onepacket) { | 783 | if (onepacket) { |
| 789 | /* almost every USB driver, host or peripheral side */ | 784 | /* almost every USB driver, host or peripheral side */ |
| @@ -897,14 +892,8 @@ cppi_next_rx_segment(struct musb *musb, struct cppi_channel *rx, int onepacket) | |||
| 897 | bd->hw_options |= CPPI_SOP_SET; | 892 | bd->hw_options |= CPPI_SOP_SET; |
| 898 | tail->hw_options |= CPPI_EOP_SET; | 893 | tail->hw_options |= CPPI_EOP_SET; |
| 899 | 894 | ||
| 900 | #ifdef CONFIG_USB_MUSB_DEBUG | 895 | for (d = rx->head; d; d = d->next) |
| 901 | if (_dbg_level(5)) { | 896 | cppi_dump_rxbd("S", d); |
| 902 | struct cppi_descriptor *d; | ||
| 903 | |||
| 904 | for (d = rx->head; d; d = d->next) | ||
| 905 | cppi_dump_rxbd("S", d); | ||
| 906 | } | ||
| 907 | #endif | ||
| 908 | 897 | ||
| 909 | /* in case the preceding transfer left some state... */ | 898 | /* in case the preceding transfer left some state... */ |
| 910 | tail = rx->last_processed; | 899 | tail = rx->last_processed; |