| From 50fff4b96a50c511388391e0a7cd522fbecf062d Mon Sep 17 00:00:00 2001 |
| From: Alexandre Bailon <abailon@baylibre.com> |
| Date: Wed, 1 Feb 2017 21:30:12 -0600 |
| Subject: [PATCH] usb: musb: da8xx: Remove CPPI 3.0 quirk and methods |
| |
| commit a994ce2d7e66008381a0b184c73be9ae9b72eb5c upstream. |
| |
| DA8xx driver is registering and using the CPPI 3.0 DMA controller but |
| actually, the DA8xx has a CPPI 4.1 DMA controller. |
| Remove the CPPI 3.0 quirk and methods. |
| |
| Fixes: f8e9f34f80a2 ("usb: musb: Fix up DMA related macros") |
| Fixes: 7f6283ed6fe8 ("usb: musb: Set up function pointers for DMA") |
| Cc: <stable@vger.kernel.org> |
| Signed-off-by: Alexandre Bailon <abailon@baylibre.com> |
| Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Acked-by: Tony Lindgren <tony@atomide.com> |
| Signed-off-by: Bin Liu <b-liu@ti.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c |
| index b03d3b867fca..9a9c82a4d35d 100644 |
| --- a/drivers/usb/musb/da8xx.c |
| +++ b/drivers/usb/musb/da8xx.c |
| @@ -458,15 +458,11 @@ static int da8xx_musb_exit(struct musb *musb) |
| } |
| |
| static const struct musb_platform_ops da8xx_ops = { |
| - .quirks = MUSB_DMA_CPPI | MUSB_INDEXED_EP, |
| + .quirks = MUSB_INDEXED_EP, |
| .init = da8xx_musb_init, |
| .exit = da8xx_musb_exit, |
| |
| .fifo_mode = 2, |
| -#ifdef CONFIG_USB_TI_CPPI_DMA |
| - .dma_init = cppi_dma_controller_create, |
| - .dma_exit = cppi_dma_controller_destroy, |
| -#endif |
| .enable = da8xx_musb_enable, |
| .disable = da8xx_musb_disable, |
| |
| -- |
| 2.12.0 |
| |