lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb: renesas_usbhs: add IRQ resource decoding for IRQF_SHARED

Browse Source 
In case of the SH7757, the irq number of USB module and SUDMAC
are the same. So, we have to set the IRQF_SHARED in such a case.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Shimoda, Yoshihiro
2012-01-05 15:37:18 +09:00
committed by Felipe Balbi
parent 10800f2ca1
commit 53069af3fa
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/usb/renesas_usbhs/common.c
View File

@@ -413,8 +413,7 @@ static int usbhs_probe(struct platform_device *pdev)
struct renesas_usbhs_platform_info *info = pdev->dev.platform_data; struct renesas_usbhs_platform_info *info = pdev->dev.platform_data;
struct renesas_usbhs_driver_callback *dfunc; struct renesas_usbhs_driver_callback *dfunc;
struct usbhs_priv *priv; struct usbhs_priv *priv;
struct resource *res; struct resource *res, *irq_res;
unsigned int irq;
int ret; int ret;
/* check platform information */ /* check platform information */
@@ -426,8 +425,8 @@ static int usbhs_probe(struct platform_device *pdev)
/* platform data */ /* platform data */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
irq = platform_get_irq(pdev, 0); irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!res || (int)irq <= 0) { if (!res || !irq_res) {
dev_err(&pdev->dev, "Not enough Renesas USB platform resources.\n"); dev_err(&pdev->dev, "Not enough Renesas USB platform resources.\n");
return -ENODEV; return -ENODEV;
} }
@@ -476,7 +475,9 @@ static int usbhs_probe(struct platform_device *pdev)
/* /*
* priv settings * priv settings
*/ */
priv->irq = irq; priv->irq = irq_res->start;
if (irq_res->flags & IORESOURCE_IRQ_SHAREABLE)
priv->irqflags = IRQF_SHARED;
priv->pdev = pdev; priv->pdev = pdev;
INIT_DELAYED_WORK(&priv->notify_hotplug_work, usbhsc_notify_hotplug); INIT_DELAYED_WORK(&priv->notify_hotplug_work, usbhsc_notify_hotplug);
spin_lock_init(usbhs_priv_to_lock(priv)); spin_lock_init(usbhs_priv_to_lock(priv));

1
drivers/usb/renesas_usbhs/common.h
View File

@@ -242,6 +242,7 @@ struct usbhs_priv {
void __iomem *base; void __iomem *base;
unsigned int irq; unsigned int irq;
unsigned long irqflags;
struct renesas_usbhs_platform_callback pfunc; struct renesas_usbhs_platform_callback pfunc;
struct renesas_usbhs_driver_param dparam; struct renesas_usbhs_driver_param dparam;

2
drivers/usb/renesas_usbhs/mod.c
View File

@@ -152,7 +152,7 @@ int usbhs_mod_probe(struct usbhs_priv *priv)
/* irq settings */ /* irq settings */
ret = request_irq(priv->irq, usbhs_interrupt, ret = request_irq(priv->irq, usbhs_interrupt,
0, dev_name(dev), priv); priv->irqflags, dev_name(dev), priv);
if (ret) { if (ret) {
dev_err(dev, "irq request err\n"); dev_err(dev, "irq request err\n");
goto mod_init_gadget_err; goto mod_init_gadget_err;