Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e75c0176 authored by Bin Liu's avatar Bin Liu Committed by Greg Kroah-Hartman
Browse files

usb: musb: dsps: do not disable CPPI41 irq in driver teardown 



commit 783f3b4e9ec50491c21746e7e05ec6c39c21f563 upstream.

TI AM335x CPPI 4.1 module uses a single register bit for CPPI interrupts
in both musb controllers. So disabling the CPPI irq in one musb driver
breaks the other musb module.

Since musb is already disabled before tearing down dma controller in
musb_remove(), it is safe to not disable CPPI irq in
musb_dma_controller_destroy().

Fixes: 25534828 ("usb: musb: dsps: Manage CPPI 4.1 DMA interrupt in DSPS")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5b6717c6

drivers/usb/musb/musb_dsps.c

+1 −11
Original line number Diff line number Diff line
@@ -684,16 +684,6 @@ dsps_dma_controller_create(struct musb *musb, void __iomem *base) 
	return controller;

}



static void dsps_dma_controller_destroy(struct dma_controller *c)

{

	struct musb *musb = c->musb;

	struct dsps_glue *glue = dev_get_drvdata(musb->controller->parent);

	void __iomem *usbss_base = glue->usbss_base;



	musb_writel(usbss_base, USBSS_IRQ_CLEARR, USBSS_IRQ_PD_COMP);

	cppi41_dma_controller_destroy(c);

}



#ifdef CONFIG_PM_SLEEP

static void dsps_dma_controller_suspend(struct dsps_glue *glue)

{
@@ -723,7 +713,7 @@ static struct musb_platform_ops dsps_ops = { 


#ifdef CONFIG_USB_TI_CPPI41_DMA

	.dma_init	= dsps_dma_controller_create,

	.dma_exit	= dsps_dma_controller_destroy,

	.dma_exit	= cppi41_dma_controller_destroy,

#endif

	.enable		= dsps_musb_enable,

	.disable	= dsps_musb_disable,