summaryrefslogtreecommitdiff
path: root/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0023-musb-add-high-bandwidth-ISO-support.patch
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-18 15:32:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-18 15:36:06 +0000
commit673abd92f999829bdd67d0273c43570a62123a63 (patch)
tree63132d1ffc1cb5bf50d244b184ca8d58a9cbc85c /meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0023-musb-add-high-bandwidth-ISO-support.patch
parentfed61beb31c47e2d96af905a7047fe78d64c9bd0 (diff)
downloadopenembedded-core-673abd92f999829bdd67d0273c43570a62123a63.tar.gz
openembedded-core-673abd92f999829bdd67d0273c43570a62123a63.tar.bz2
openembedded-core-673abd92f999829bdd67d0273c43570a62123a63.tar.xz
openembedded-core-673abd92f999829bdd67d0273c43570a62123a63.zip
conf/machine: Drop older machines with no recent updates
These are all moving to meta-extras. Ideally in the future machines such as these will be maintained to topic specific layers as we move to a more layer oriented model. If this causes a problem for anyone please discuss it on the mailing list. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0023-musb-add-high-bandwidth-ISO-support.patch')
-rw-r--r--meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0023-musb-add-high-bandwidth-ISO-support.patch187
1 files changed, 0 insertions, 187 deletions
diff --git a/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0023-musb-add-high-bandwidth-ISO-support.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0023-musb-add-high-bandwidth-ISO-support.patch
deleted file mode 100644
index 3038dd171..000000000
--- a/meta/recipes-kernel/linux/linux-omap-2.6.29/musb/0023-musb-add-high-bandwidth-ISO-support.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From 2e049a88b729ae2fdc0ecdabad1857810bd62737 Mon Sep 17 00:00:00 2001
-From: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
-Date: Fri, 3 Apr 2009 16:16:17 -0700
-Subject: [PATCH] musb: add high bandwidth ISO support
-
-Tested on OMAP3 host side with Creative (Live! Cam Optia) USB camera
-which uses high bandwidth isochronous IN endpoints. FIFO mode 4 is
-updated to provide the needed 4K endpoint buffer without breaking
-the g_nokia composite gadget configuration. (This is the only
-gadget driver known to use enough endpoints to notice the change.)
-
-Signed-off-by: Ajay Kumar Gupta <ajay.gupta-l0cyMroinI0@public.gmane.org>
-Signed-off-by: David Brownell <dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
----
- drivers/usb/musb/musb_core.c | 19 ++++++++---------
- drivers/usb/musb/musb_core.h | 3 ++
- drivers/usb/musb/musb_host.c | 47 +++++++++++++++++++++++++++++++----------
- drivers/usb/musb/musb_host.h | 1 +
- 4 files changed, 48 insertions(+), 22 deletions(-)
-
-diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
-index a1de43b..d953305 100644
---- a/drivers/usb/musb/musb_core.c
-+++ b/drivers/usb/musb/musb_core.c
-@@ -1068,14 +1068,13 @@ static struct fifo_cfg __initdata mode_4_cfg[] = {
- { .hw_ep_num = 8, .style = FIFO_RX, .maxpacket = 512, },
- { .hw_ep_num = 9, .style = FIFO_TX, .maxpacket = 512, },
- { .hw_ep_num = 9, .style = FIFO_RX, .maxpacket = 512, },
--{ .hw_ep_num = 10, .style = FIFO_TX, .maxpacket = 512, },
--{ .hw_ep_num = 10, .style = FIFO_RX, .maxpacket = 512, },
--{ .hw_ep_num = 11, .style = FIFO_TX, .maxpacket = 512, },
--{ .hw_ep_num = 11, .style = FIFO_RX, .maxpacket = 512, },
--{ .hw_ep_num = 12, .style = FIFO_TX, .maxpacket = 512, },
--{ .hw_ep_num = 12, .style = FIFO_RX, .maxpacket = 512, },
--{ .hw_ep_num = 13, .style = FIFO_TX, .maxpacket = 512, },
--{ .hw_ep_num = 13, .style = FIFO_RX, .maxpacket = 512, },
-+{ .hw_ep_num = 10, .style = FIFO_TX, .maxpacket = 256, },
-+{ .hw_ep_num = 10, .style = FIFO_RX, .maxpacket = 64, },
-+{ .hw_ep_num = 11, .style = FIFO_TX, .maxpacket = 256, },
-+{ .hw_ep_num = 11, .style = FIFO_RX, .maxpacket = 64, },
-+{ .hw_ep_num = 12, .style = FIFO_TX, .maxpacket = 256, },
-+{ .hw_ep_num = 12, .style = FIFO_RX, .maxpacket = 64, },
-+{ .hw_ep_num = 13, .style = FIFO_RXTX, .maxpacket = 4096, },
- { .hw_ep_num = 14, .style = FIFO_RXTX, .maxpacket = 1024, },
- { .hw_ep_num = 15, .style = FIFO_RXTX, .maxpacket = 1024, },
- };
-@@ -1335,11 +1334,11 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
- }
- if (reg & MUSB_CONFIGDATA_HBRXE) {
- strcat(aInfo, ", HB-ISO Rx");
-- strcat(aInfo, " (X)"); /* no driver support */
-+ musb->hb_iso_rx = true;
- }
- if (reg & MUSB_CONFIGDATA_HBTXE) {
- strcat(aInfo, ", HB-ISO Tx");
-- strcat(aInfo, " (X)"); /* no driver support */
-+ musb->hb_iso_tx = true;
- }
- if (reg & MUSB_CONFIGDATA_SOFTCONE)
- strcat(aInfo, ", SoftConn");
-diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
-index f56a56c..0ac4faf 100644
---- a/drivers/usb/musb/musb_core.h
-+++ b/drivers/usb/musb/musb_core.h
-@@ -387,6 +387,9 @@ struct musb {
- unsigned is_multipoint:1;
- unsigned ignore_disconnect:1; /* during bus resets */
-
-+ unsigned hb_iso_rx:1; /* high bandwidth iso rx? */
-+ unsigned hb_iso_tx:1; /* high bandwidth iso tx? */
-+
- #ifdef C_MP_TX
- unsigned bulk_split:1;
- #define can_bulk_split(musb,type) \
-diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
-index 71e835e..ece5122 100644
---- a/drivers/usb/musb/musb_host.c
-+++ b/drivers/usb/musb/musb_host.c
-@@ -602,7 +602,8 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, struct musb_hw_ep *ep)
- musb_writeb(ep->regs, MUSB_RXTYPE, qh->type_reg);
- musb_writeb(ep->regs, MUSB_RXINTERVAL, qh->intv_reg);
- /* NOTE: bulk combining rewrites high bits of maxpacket */
-- musb_writew(ep->regs, MUSB_RXMAXP, qh->maxpacket);
-+ musb_writew(ep->regs, MUSB_RXMAXP,
-+ qh->maxpacket | ((qh->hb_mult - 1) << 11));
-
- ep->rx_reinit = 0;
- }
-@@ -624,9 +625,10 @@ static bool musb_tx_dma_program(struct dma_controller *dma,
- csr = musb_readw(epio, MUSB_TXCSR);
- if (length > pkt_size) {
- mode = 1;
-- csr |= MUSB_TXCSR_AUTOSET
-- | MUSB_TXCSR_DMAMODE
-- | MUSB_TXCSR_DMAENAB;
-+ csr |= MUSB_TXCSR_DMAMODE | MUSB_TXCSR_DMAENAB;
-+ /* autoset shouldn't be set in high bandwidth */
-+ if (qh->hb_mult == 1)
-+ csr |= MUSB_TXCSR_AUTOSET;
- } else {
- mode = 0;
- csr &= ~(MUSB_TXCSR_AUTOSET | MUSB_TXCSR_DMAMODE);
-@@ -1432,6 +1434,10 @@ void musb_host_rx(struct musb *musb, u8 epnum)
- /* packet error reported later */
- iso_err = true;
- }
-+ } else if (rx_csr & MUSB_RXCSR_INCOMPRX) {
-+ DBG(3, "end %d high bandwidth incomplete ISO packet RX\n",
-+ epnum);
-+ status = -EPROTO;
- }
-
- /* faults abort the transfer */
-@@ -1639,7 +1645,11 @@ void musb_host_rx(struct musb *musb, u8 epnum)
- val &= ~MUSB_RXCSR_H_AUTOREQ;
- else
- val |= MUSB_RXCSR_H_AUTOREQ;
-- val |= MUSB_RXCSR_AUTOCLEAR | MUSB_RXCSR_DMAENAB;
-+ val |= MUSB_RXCSR_DMAENAB;
-+
-+ /* autoclear shouldn't be set in high bandwidth */
-+ if (qh->hb_mult == 1)
-+ val |= MUSB_RXCSR_AUTOCLEAR;
-
- musb_writew(epio, MUSB_RXCSR,
- MUSB_RXCSR_H_WZC_BITS | val);
-@@ -1725,9 +1735,10 @@ static int musb_schedule(
- continue;
-
- if (is_in)
-- diff = hw_ep->max_packet_sz_rx - qh->maxpacket;
-+ diff = hw_ep->max_packet_sz_rx;
- else
-- diff = hw_ep->max_packet_sz_tx - qh->maxpacket;
-+ diff = hw_ep->max_packet_sz_tx;
-+ diff -= (qh->maxpacket * qh->hb_mult);
-
- if (diff >= 0 && best_diff > diff) {
- best_diff = diff;
-@@ -1830,15 +1841,27 @@ static int musb_urb_enqueue(
- qh->is_ready = 1;
-
- qh->maxpacket = le16_to_cpu(epd->wMaxPacketSize);
-+ qh->type = usb_endpoint_type(epd);
-
-- /* no high bandwidth support yet */
-- if (qh->maxpacket & ~0x7ff) {
-- ret = -EMSGSIZE;
-- goto done;
-+ /* Bits 11 & 12 of wMaxPacketSize encode high bandwidth multiplier.
-+ * Some musb cores don't support high bandwidth ISO transfers; and
-+ * we don't (yet!) support high bandwidth interrupt transfers.
-+ */
-+ qh->hb_mult = 1 + ((qh->maxpacket >> 11) & 0x03);
-+ if (qh->hb_mult > 1) {
-+ int ok = (qh->type == USB_ENDPOINT_XFER_ISOC);
-+
-+ if (ok)
-+ ok = (usb_pipein(urb->pipe) && musb->hb_iso_rx)
-+ || (usb_pipeout(urb->pipe) && musb->hb_iso_tx);
-+ if (!ok) {
-+ ret = -EMSGSIZE;
-+ goto done;
-+ }
-+ qh->maxpacket &= 0x7ff;
- }
-
- qh->epnum = usb_endpoint_num(epd);
-- qh->type = usb_endpoint_type(epd);
-
- /* NOTE: urb->dev->devnum is wrong during SET_ADDRESS */
- qh->addr_reg = (u8) usb_pipedevice(urb->pipe);
-diff --git a/drivers/usb/musb/musb_host.h b/drivers/usb/musb/musb_host.h
-index 0b7fbcd..14b0077 100644
---- a/drivers/usb/musb/musb_host.h
-+++ b/drivers/usb/musb/musb_host.h
-@@ -67,6 +67,7 @@ struct musb_qh {
- u8 is_ready; /* safe to modify hw_ep */
- u8 type; /* XFERTYPE_* */
- u8 epnum;
-+ u8 hb_mult; /* high bandwidth pkts per uf */
- u16 maxpacket;
- u16 frame; /* for periodic schedule */
- unsigned iso_idx; /* in urb->iso_frame_desc[] */
---
-1.6.0.4
-