:: Re: [maemo-leste] USB PHY Initializ…
Top Page
Delete this message
Reply to this message
Author: Tony Lindgren
Date:  
To: Sicelo
CC: linux-usb, linux-omap, maemo-leste, Felipe Balbi, phone-devel, Bin Liu, Rob Herring, H. Nikolaus Schaller
Subject: Re: [maemo-leste] USB PHY Initialization Fails on Nokia N900 Since 5.19
* Sicelo <absicsz@???> [221111 08:26]:
> Just for further testing, I added the very ugly patch below. Applied on
> vanilla 6.1-rc3 (i.e. containing 239071064732), USB works normally on
> the N900.
>
> I copied the irq numbers from omap3xxx.dtsi. Does this give us any hints
> regarding the cause and resolution of this issue?


OK thanks that helps, I think it's because the platform IRQ resources are
no longer being automatically populated from devicetree because of the
issues with deferred probe.

Maybe give the following patch a try and see if it helps?

Then assuming this works as a fix I'll post further changes to make also
omap2430 glue layer to probe with ti-sysc interconnect target module
driver in call cases.

Regards,

Tony

8< -------------------
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -15,6 +15,7 @@
 #include <linux/list.h>
 #include <linux/io.h>
 #include <linux/of.h>
+#include <linux/of_irq.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/pm_runtime.h>
@@ -310,6 +311,7 @@ static int omap2430_probe(struct platform_device *pdev)
     struct device_node        *control_node;
     struct platform_device        *control_pdev;
     int                ret = -ENOMEM, val;
+    bool                populate_irqs = false;


     if (!np)
         return -ENODEV;
@@ -328,6 +330,18 @@ static int omap2430_probe(struct platform_device *pdev)
     musb->dev.dma_mask        = &omap2430_dmamask;
     musb->dev.coherent_dma_mask    = omap2430_dmamask;


+    /*
+     * Legacy SoCs using omap_device get confused if node is moved
+     * because of interconnect properties mixed into the node.
+     */
+    if (of_get_property(np, "ti,hwmods", NULL)) {
+        dev_warn(&pdev->dev, "please update to probe with ti-sysc\n");
+        populate_irqs = true;
+    } else {
+        device_set_of_node_from_dev(&musb->dev, &pdev->dev);
+    }
+    of_node_put(np);
+
     glue->dev            = &pdev->dev;
     glue->musb            = musb;
     glue->status            = MUSB_UNKNOWN;
@@ -389,6 +403,46 @@ static int omap2430_probe(struct platform_device *pdev)
         goto err2;
     }


+    if (populate_irqs) {
+        struct resource musb_res[3];
+        struct resource *res;
+        int i = 0;
+
+        memset(musb_res, 0, sizeof(*musb_res) * ARRAY_SIZE(musb_res));
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+            goto err2;
+
+        musb_res[i].start = res->start;
+        musb_res[i].end = res->end;
+        musb_res[i].flags = res->flags;
+        musb_res[i].name = res->name;
+        i++;
+
+        ret = of_irq_get_byname(np, "mc");
+        if (ret > 0) {
+            musb_res[i].start = ret;
+            musb_res[i].flags = IORESOURCE_IRQ;
+            musb_res[i].name = "mc";
+            i++;
+        }
+
+        ret = of_irq_get_byname(np, "dma");
+        if (ret > 0) {
+            musb_res[i].start = ret;
+            musb_res[i].flags = IORESOURCE_IRQ;
+            musb_res[i].name = "dma";
+            i++;
+        }
+
+        ret = platform_device_add_resources(musb, musb_res, i);
+        if (ret) {
+            dev_err(&pdev->dev, "failed to add IRQ resources\n");
+            goto err2;
+        }
+    }
+
     ret = platform_device_add_data(musb, pdata, sizeof(*pdata));
     if (ret) {
         dev_err(&pdev->dev, "failed to add platform_data\n");
-- 
2.38.1