On Thu, 9 Jan 2014, Hans de Goede wrote:
> Add support for ohci-platform instantiation from devicetree, including
> optionally getting clks and a phy from devicetree, and enabling / disabling
> those on power_on / off.
>
> This should allow using ohci-platform from devicetree in various cases.
> Specifically after this commit it can be used for the ohci controller found
> on Allwinner sunxi SoCs.
>
> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Looking pretty good. Still a couple of things to address...
> +static struct usb_ohci_pdata ohci_platform_defaults = {
> + .power_on = ohci_platform_power_on,
> + .power_suspend = ohci_platform_power_off,
> + .power_off = ohci_platform_power_off,
> };
I wonder if these routines couldn't be shared with non-DT setups. We
could add an array of 3 struct clk pointers to the usb_ohci_pdata
structure. Then if any of them are set, store these routines in the
power_* pointers. (And likewise for ehci-platform.) Something to
consider for a future patch...
> @@ -60,12 +128,24 @@ static int ohci_platform_probe(struct platform_device *dev)
> struct usb_hcd *hcd;
> struct resource *res_mem;
> struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev);
> - int irq;
> - int err = -ENOMEM;
> + struct ohci_platform_priv *priv;
> + int clk, irq, err;
>
> + /*
> + * Use reasonable defaults so platforms don't have to provide these
> + * with DT probing on ARM.
> + */
> if (!pdata) {
> - WARN_ON(1);
> - return -ENODEV;
> + pdata = dev->dev.platform_data = &ohci_platform_defaults;
This has a subtle bug. Consider what will happen if ohci-platform is
loaded, then unloaded and loaded again.
The existing ehci-platform driver has this same bug. I definitely
remember discussing at once or twice in the past, but evidently it has
never been fixed.
> + /*
> + * Right now device-tree probed devices don't get dma_mask set.
> + * Since shared usb code relies on it, set it here for now.
> + * Once we have dma capability bindings this can go away.
> + */
> + err = dma_coerce_mask_and_coherent(&dev->dev,
> + DMA_BIT_MASK(32));
> + if (err)
> + return err;
The ehci-platform driver does this even when platform data is present.
I guess you should do the same thing here (and lose the comment).
(Also, I dislike this alignment of the continuation line. IMO it's a
bad idea to match up with some particular element of the preceding
line. The style used in most of the USB stack is to indent
continuation lines by two tab stops.)
> }
>
> if (usb_disabled())
This test belongs at the start of the function. It is more fundamental
than the stuff you inserted.
> @@ -83,17 +163,39 @@ static int ohci_platform_probe(struct platform_device *dev)
> return -ENXIO;
> }
>
> + hcd = usb_create_hcd(&ohci_platform_hc_driver, &dev->dev,
> + dev_name(&dev->dev));
> + if (!hcd)
> + return -ENOMEM;
> +
> + priv = (struct ohci_platform_priv *)hcd_to_ohci(hcd)->priv;
Please define an inline routine or a macro for this messy computation.
Alan Stern
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
