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

Commit 34404082 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

usb: gadget/imx-udc: fix interrupt name again 



Commit 06c3859f (usb: gadget/imx-udc: remove usage of deprecated symbol
USBD_INT0) was a bit precipitant because the name used instead didn't
match the usual naming scheme for irqs on arm/imx.  I renamed the irq to
the right name in e0830004 (ARM: imx: dynamically allocate imx_udc
device) when 06c3859f didn't hit Linus' tree, so I missed to add a
compat #define.

This patch allows compiling imx_udc.c with and without e0830004.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8170344c

drivers/usb/gadget/imx_udc.c

+6 −2
Original line number Diff line number Diff line
@@ -1191,13 +1191,17 @@ static irqreturn_t imx_udc_ctrl_irq(int irq, void *dev) 
	return IRQ_HANDLED;

}



#ifndef MX1_INT_USBD0

#define MX1_INT_USBD0 MX1_USBD_INT0

#endif



static irqreturn_t imx_udc_bulk_irq(int irq, void *dev)

{

	struct imx_udc_struct *imx_usb = dev;

	struct imx_ep_struct *imx_ep = &imx_usb->imx_ep[irq - MX1_USBD_INT0];

	struct imx_ep_struct *imx_ep = &imx_usb->imx_ep[irq - MX1_INT_USBD0];

	int intr = __raw_readl(imx_usb->base + USB_EP_INTR(EP_NO(imx_ep)));



	dump_ep_intr(__func__, irq - MX1_USBD_INT0, intr, imx_usb->dev);

	dump_ep_intr(__func__, irq - MX1_INT_USBD0, intr, imx_usb->dev);



	if (!imx_usb->driver) {

		__raw_writel(intr, imx_usb->base + USB_EP_INTR(EP_NO(imx_ep)));