| Message ID | 20170125103319.26021-2-abailon@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jan 25, 2017 at 11:33:15AM +0100, Alexandre Bailon wrote: > 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") > Signed-off-by: Alexandre Bailon <abailon@baylibre.com> > Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > Acked-by: Tony Lindgren <tony@atomide.com> Applied, and added 'cc stable' tag. Since the dependant patch set is not ready to merge yet, I only picked this patch in this set for v4.11-rc1. Thanks, -Bin. > --- > drivers/usb/musb/da8xx.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c > index e89708d..cd3d763 100644 > --- a/drivers/usb/musb/da8xx.c > +++ b/drivers/usb/musb/da8xx.c > @@ -458,15 +458,11 @@ static inline u8 get_vbus_power(struct device *dev) > } > > 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.10.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c index e89708d..cd3d763 100644 --- a/drivers/usb/musb/da8xx.c +++ b/drivers/usb/musb/da8xx.c @@ -458,15 +458,11 @@ static inline u8 get_vbus_power(struct device *dev) } 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,
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") Signed-off-by: Alexandre Bailon <abailon@baylibre.com> Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Acked-by: Tony Lindgren <tony@atomide.com> --- drivers/usb/musb/da8xx.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)