On Wed, Oct 3, 2012 at 7:15 PM, Philippe De Swert
<philippe.desw...@jollamobile.com> wrote:
> So any comments on the approach here (see patch kept below)? Or should I
> immediately send it as a new patch to get the comments? I sent it in this
> thread as it also solves the issue I have.
Patch is fine for me. Not sure if Felipe has some comments.
> BTW: CONFIG_SOC_OMAP3430 could be easily removed as it only changes minor
> things in the musb stack. It would clean up the code and get rid of this very
> misleading option as it has nothing to do with any OMAP3430 soc specific
> handling.
It would be better if some OMAP3430 users can comment on this.
>> From deae78e1084749f340ae8b8aaeca51818d5bfc55 Mon Sep 17 00:00:00 2001
>> From: Philippe De Swert <philippe.desw...@jollamobile.com>
>> Date: Wed, 26 Sep 2012 17:00:46 +0300
>> Subject: [PATCH 1/1] musb: Move generic_interrupt out of the way
>>
>> Have all musb drivers define their own isr.
>>
>> Signed-off-by: Philippe De Swert <philippe.desw...@jollamobile.com>
>> ---
>> drivers/usb/musb/musb_core.c | 33 ++-------------------------------
>> drivers/usb/musb/omap2430.c | 22 ++++++++++++++++++++++
>> drivers/usb/musb/ux500.c | 21 +++++++++++++++++++++
>> 3 files changed, 45 insertions(+), 31 deletions(-)
>>
>> diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
>> index 26f1bef..1d5ee34 100644
>> --- a/drivers/usb/musb/musb_core.c
>> +++ b/drivers/usb/musb/musb_core.c
>> @@ -1496,35 +1496,6 @@ static int __devinit musb_core_init(u16 musb_type,
>> struct musb *musb)
>> return 0;
>> }
>>
>> -/*-------------------------------------------------------------------------*/
>> -
>> -#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430) || \
>> - defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500)
>> -
>> -static irqreturn_t generic_interrupt(int irq, void *__hci)
>> -{
>> - unsigned long flags;
>> - irqreturn_t retval = IRQ_NONE;
>> - struct musb *musb = __hci;
>> -
>> - spin_lock_irqsave(&musb->lock, flags);
>> -
>> - musb->int_usb = musb_readb(musb->mregs, MUSB_INTRUSB);
>> - musb->int_tx = musb_readw(musb->mregs, MUSB_INTRTX);
>> - musb->int_rx = musb_readw(musb->mregs, MUSB_INTRRX);
>> -
>> - if (musb->int_usb || musb->int_tx || musb->int_rx)
>> - retval = musb_interrupt(musb);
>> -
>> - spin_unlock_irqrestore(&musb->lock, flags);
>> -
>> - return retval;
>> -}
>> -
>> -#else
>> -#define generic_interrupt NULL
>> -#endif
>> -
>> /*
>> * handle all the irqs defined by the HDRC core. for now we expect: other
>> * irq sources (phy, dma, etc) will be handled first, musb->int_* values
>> @@ -1907,7 +1878,8 @@ musb_init_controller(struct device *dev, int nIrq,
>> void __iomem *ctrl)
>> musb->ops = plat->platform_ops;
>>
>> /* The musb_platform_init() call:
>> - * - adjusts musb->mregs and musb->isr if needed,
>> + * - adjusts musb->mregs if needed
>> + * - sets the musb->isr
>> * - may initialize an integrated tranceiver
>> * - initializes musb->xceiv, usually by otg_get_phy()
>> * - stops powering VBUS
>> @@ -1917,7 +1889,6 @@ musb_init_controller(struct device *dev, int nIrq,
>> void __iomem *ctrl)
>> * external/discrete ones in various flavors (twl4030 family,
>> * isp1504, non-OTG, etc) mostly hooking up through ULPI.
>> */
>> - musb->isr = generic_interrupt;
>> status = musb_platform_init(musb);
>> if (status < 0)
>> goto fail1;
>> diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
>> index 5fdb9da..5461619d 100644
>> --- a/drivers/usb/musb/omap2430.c
>> +++ b/drivers/usb/musb/omap2430.c
>> @@ -306,6 +306,26 @@ static void omap_musb_mailbox_work(struct work_struct
>> *mailbox_work)
>> omap_musb_set_mailbox(glue);
>> }
>>
>> +static irqreturn_t omap2430_musb_interrupt(int irq, void *__hci)
>> +{
>> + unsigned long flags;
>> + irqreturn_t retval = IRQ_NONE;
>> + struct musb *musb = __hci;
>> +
>> + spin_lock_irqsave(&musb->lock, flags);
>> +
>> + musb->int_usb = musb_readb(musb->mregs, MUSB_INTRUSB);
>> + musb->int_tx = musb_readw(musb->mregs, MUSB_INTRTX);
>> + musb->int_rx = musb_readw(musb->mregs, MUSB_INTRRX);
>> +
>> + if (musb->int_usb || musb->int_tx || musb->int_rx)
>> + retval = musb_interrupt(musb);
>> +
>> + spin_unlock_irqrestore(&musb->lock, flags);
>> +
>> + return retval;
>> +}
>> +
>> static int omap2430_musb_init(struct musb *musb)
>> {
>> u32 l;
>> @@ -325,6 +345,8 @@ static int omap2430_musb_init(struct musb *musb)
>> return -ENODEV;
>> }
>>
>> + musb->isr = omap2430_musb_interrupt;
>> +
>> status = pm_runtime_get_sync(dev);
>> if (status < 0) {
>> dev_err(dev, "pm_runtime_get_sync FAILED %d\n", status);
>> diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c
>> index a8c0fad..ec9aaec 100644
>> --- a/drivers/usb/musb/ux500.c
>> +++ b/drivers/usb/musb/ux500.c
>> @@ -36,6 +36,26 @@ struct ux500_glue {
>> };
>> #define glue_to_musb(g) platform_get_drvdata(g->musb)
>>
>> +static irqreturn_t ux500_musb_interrupt(int irq, void *__hci)
>> +{
>> + unsigned long flags;
>> + irqreturn_t retval = IRQ_NONE;
>> + struct musb *musb = __hci;
>> +
>> + spin_lock_irqsave(&musb->lock, flags);
>> +
>> + musb->int_usb = musb_readb(musb->mregs, MUSB_INTRUSB);
>> + musb->int_tx = musb_readw(musb->mregs, MUSB_INTRTX);
>> + musb->int_rx = musb_readw(musb->mregs, MUSB_INTRRX);
>> +
>> + if (musb->int_usb || musb->int_tx || musb->int_rx)
>> + retval = musb_interrupt(musb);
>> +
>> + spin_unlock_irqrestore(&musb->lock, flags);
>> +
>> + return retval;
>> +}
>> +
>> static int ux500_musb_init(struct musb *musb)
>> {
>> musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
>> @@ -43,6 +63,7 @@ static int ux500_musb_init(struct musb *musb)
>> pr_err("HS USB OTG: no transceiver configured\n");
>> return -ENODEV;
>> }
>> + musb->isr = ux500_musb_interrupt;
>>
>> return 0;
>> }
>> --
>> 1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
