On Thu, Nov 28, 2013 at 01:56:09PM +0400, Sergei Shtylyov wrote: > Hello. > > On 27-11-2013 23:35, Felipe Balbi wrote: > > >From: Sergei Shtylyov <sergei.shtylyov@xxxxxxxxxxxxxxxxxx> > > >commit upstream ea78201e2e08f8a91e30100c4c4a908b5cf295fc > > >After commit 09fc7d22b024692b2fe8a943b246de1af307132b (usb: musb: fix incorrect > >usage of resource pointer), CPPI DMA driver on DaVinci DM6467 can't detect its > >dedicated IRQ and so the MUSB IRQ is erroneously used instead. This is because > >only 2 resources are passed to the MUSB driver from the DaVinci glue layer, so > >fix this by always copying 3 resources (it's safe since a placeholder for the > >3rd resource is always there) and passing 'pdev->num_resources' instead of the > >size of musb_resources[] to platform_device_add_resources(). > > >Cc: <stable@xxxxxxxxxxxxxxx> # 3.11+ > >Signed-off-by: Sergei Shtylyov <sergei.shtylyov@xxxxxxxxxxxxxxxxxx> > >Signed-off-by: Felipe Balbi <balbi@xxxxxx> > >--- > > >backported from v3.13. > > Note that this doesn't match to what I was sending for 3.12. I > don't think you've correctly ported my patch to 3.13-rc1. > > > drivers/usb/musb/davinci.c | 11 ++++++++++- > > 1 file changed, 10 insertions(+), 1 deletion(-) > > >diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c > >index ed0834e..ab69245 100644 > >--- a/drivers/usb/musb/davinci.c > >+++ b/drivers/usb/musb/davinci.c > [...] > >@@ -567,6 +567,15 @@ static int davinci_probe(struct platform_device *pdev) > > musb_resources[1].end = pdev->resource[1].end; > > musb_resources[1].flags = pdev->resource[1].flags; > > > >+ /* > >+ * For DM6467 3 resources are passed. A placeholder for the 3rd > >+ * resource is always there, so it's safe to always copy it... > >+ */ > >+ musb_resources[2].name = pdev->resource[2].name; > >+ musb_resources[2].start = pdev->resource[2].start; > >+ musb_resources[2].end = pdev->resource[2].end; > >+ musb_resources[2].flags = pdev->resource[2].flags; > >+ > > ret = platform_device_add_resources(musb, musb_resources, > > ARRAY_SIZE(musb_resources)); > > I had this line changed to 'pdev->num_resources'. hmmm, I missed that part indeed. Will fix it and re-send. -- balbi
Attachment:
signature.asc
Description: Digital signature