diff options
| author | Thirupathi Chippakurthy <thirupathi.chippakurthy@stericsson.com> | 2011-09-13 16:35:14 +0530 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:03:08 +0200 |
| commit | 6d2bff7c6a6275b4209bf41208e611734b2cf340 (patch) | |
| tree | 6e30b96a7826ee9a4991ed6c6d477ead8f20e5d2 | |
| parent | 335b68a7e5fcf66b6ae24ece39ea188bdd384563 (diff) | |
musb: host: linux Kernel3.0 host dma disabled
The dma driver disabled in Host Mode.
Only enabled in Device mode.
ST-Ericsson ID: 352334
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by:<thirupathi.chippakurthy@stericsson.com>
Change-Id: I5d26d2990d1c01a2ce461eb87f2e8d4518f0e40a
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30823
Reviewed-by: Praveena NADAHALLY <praveen.nadahally@stericsson.com>
| -rw-r--r-- | drivers/usb/musb/musb_core.c | 1 | ||||
| -rw-r--r-- | drivers/usb/musb/musb_host.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index e54b512b7b5..9b9f3de02c0 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -1886,7 +1886,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) status = -ENODEV; goto fail0; } - dev->dma_mask = 0 ; /* allocate */ musb = allocate_instance(dev, plat->config, ctrl); if (!musb) { diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 5765470aa80..d278ba4d391 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -46,6 +46,7 @@ #include "musb_core.h" #include "musb_host.h" +static bool is_host_dma_enabled; /* MUSB HOST status 22-mar-2006 * @@ -710,7 +711,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, musb_ep_select(mbase, epnum); /* candidate for DMA? */ - dma_controller = musb->dma_controller; + dma_controller = is_host_dma_enabled ? musb->dma_controller : NULL; if (is_dma_capable() && epnum && dma_controller) { dma_channel = is_out ? hw_ep->tx_channel : hw_ep->rx_channel; if (!dma_channel) { @@ -2278,6 +2279,7 @@ static int musb_h_start(struct usb_hcd *hcd) */ hcd->state = HC_STATE_RUNNING; musb->port1_status = 0; + is_host_dma_enabled = false; return 0; } |