Hi,
> -----Original Message-----
> From: [email protected] [mailto:[email protected]]
> On Behalf Of Hans de Goede
> Sent: Friday, January 10, 2014 1:57 AM
> To: Alan Stern; Tony Prisk
> Cc: [email protected]; devicetree; linux-usb; linux-
> [email protected]; Hans de Goede
> Subject: [linux-sunxi] [PATCH v3 1/2] ohci-platform: Add support for
devicetree
> instantiation
>
> 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 <[email protected]>
> ---
> .../devicetree/bindings/usb/mmio-ohci.txt | 22 +++
> drivers/usb/host/ohci-platform.c | 150
++++++++++++++++++---
> 2 files changed, 152 insertions(+), 20 deletions(-) create mode 100644
> Documentation/devicetree/bindings/usb/mmio-ohci.txt
>
> diff --git a/Documentation/devicetree/bindings/usb/mmio-ohci.txt
> b/Documentation/devicetree/bindings/usb/mmio-ohci.txt
> new file mode 100644
> index 0000000..9c776ed
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/usb/mmio-ohci.txt
> @@ -0,0 +1,22 @@
> +Generic MMIO OHCI controller
> +
> +Required properties:
> +- compatible : "mmio-ohci"
> +- reg : ohci controller register range (address and length)
> +- interrupts : ohci controller interrupt
> +
> +Optional properties:
> +- clocks : a list of phandle + clock specifier pairs
> +- phys : phandle + phy specifier pair
> +- phy-names : "usb"
> +
> +Example:
> +
> + ohci0: ohci@0x01c14400 {
> + compatible = "mmio-ohci";
> + reg = <0x01c14400 0x100>;
> + interrupts = <64>;
> + clocks = <&usb_clk 6>, <&ahb_gates 2>;
> + phys = <&usbphy 1>;
> + phy-names = "usb";
> + };
> diff --git a/drivers/usb/host/ohci-platform.c
b/drivers/usb/host/ohci-platform.c
> index f351ff5..a46d7ac 100644
> --- a/drivers/usb/host/ohci-platform.c
> +++ b/drivers/usb/host/ohci-platform.c
> @@ -3,6 +3,7 @@
> *
> * Copyright 2007 Michael Buesch <[email protected]>
> * Copyright 2011-2012 Hauke Mehrtens <[email protected]>
> + * Copyright 2014 Hans de Goede <[email protected]>
> *
> * Derived from the OCHI-SSB driver
> * Derived from the OHCI-PCI driver
> @@ -14,11 +15,14 @@
> * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> +#include <linux/clk.h>
> +#include <linux/dma-mapping.h>
> #include <linux/hrtimer.h>
> #include <linux/io.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/err.h>
> +#include <linux/phy/phy.h>
> #include <linux/platform_device.h>
> #include <linux/usb/ohci_pdriver.h>
> #include <linux/usb.h>
> @@ -28,6 +32,12 @@
>
> #define DRIVER_DESC "OHCI generic platform driver"
>
> +#define OHCI_MAX_CLKS 3
I still recommend using of_count_phandle_with_args(np, "clocks",
"#clock-cells") to determine the number of clocks or the existence of clocks
property (-ENOENT)
> +struct ohci_platform_priv {
> + struct clk *clks[OHCI_MAX_CLKS];
> + struct phy *phy;
> +};
> +
> static const char hcd_name[] = "ohci-platform";
>
> static int ohci_platform_reset(struct usb_hcd *hcd) @@ -48,11 +58,69 @@
> static int ohci_platform_reset(struct usb_hcd *hcd)
> return ohci_setup(hcd);
> }
>
> +static int ohci_platform_power_on(struct platform_device *dev) {
> + struct usb_hcd *hcd = platform_get_drvdata(dev);
> + struct ohci_platform_priv *priv =
> + (struct ohci_platform_priv *)hcd_to_ohci(hcd)->priv;
> + int clk, ret;
> +
> + for (clk = 0; priv->clks[clk] && clk < OHCI_MAX_CLKS; clk++) {
> + ret = clk_prepare_enable(priv->clks[clk]);
> + if (ret)
> + goto err_disable_clks;
> + }
> +
> + if (priv->phy) {
> + ret = phy_init(priv->phy);
> + if (ret)
> + goto err_disable_clks;
> +
> + ret = phy_power_on(priv->phy);
> + if (ret)
> + goto err_exit_phy;
> + }
> +
> + return 0;
> +
> +err_exit_phy:
> + phy_exit(priv->phy);
> +err_disable_clks:
> + while (--clk >= 0)
> + clk_disable_unprepare(priv->clks[clk]);
> +
> + return ret;
> +}
> +
> +static void ohci_platform_power_off(struct platform_device *dev) {
> + struct usb_hcd *hcd = platform_get_drvdata(dev);
> + struct ohci_platform_priv *priv =
> + (struct ohci_platform_priv *)hcd_to_ohci(hcd)->priv;
> + int clk;
> +
> + if (priv->phy) {
> + phy_power_off(priv->phy);
> + phy_exit(priv->phy);
> + }
> +
> + for (clk = OHCI_MAX_CLKS - 1; clk >= 0; clk--)
> + if (priv->clks[clk])
> + clk_disable_unprepare(priv->clks[clk]);
> +}
> +
> static struct hc_driver __read_mostly ohci_platform_hc_driver;
>
> static const struct ohci_driver_overrides platform_overrides __initconst
= {
> - .product_desc = "Generic Platform OHCI controller",
> - .reset = ohci_platform_reset,
> + .product_desc = "Generic Platform OHCI controller",
> + .reset = ohci_platform_reset,
> + .extra_priv_size = sizeof(struct ohci_platform_priv),
> +};
> +
> +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,
> };
>
> static int ohci_platform_probe(struct platform_device *dev) @@ -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;
> + /*
> + * 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;
> }
>
> if (usb_disabled())
> @@ -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;
> +
> + if (pdata == &ohci_platform_defaults && dev->dev.of_node) {
> + priv->phy = devm_phy_get(&dev->dev, "usb");
> + if (IS_ERR(priv->phy)) {
> + err = PTR_ERR(priv->phy);
> + if (err == -EPROBE_DEFER)
> + goto err_put_hcd;
> + priv->phy = NULL;
> + }
> +
> + for (clk = 0; clk < OHCI_MAX_CLKS; clk++) {
> + priv->clks[clk] = of_clk_get(dev->dev.of_node, clk);
> + if (IS_ERR(priv->clks[clk])) {
> + err = PTR_ERR(priv->clks[clk]);
> + if (err == -EPROBE_DEFER)
> + goto err_put_clks;
> + priv->clks[clk] = NULL;
> + break;
> + }
> + }
> + }
> +
> + platform_set_drvdata(dev, hcd);
> if (pdata->power_on) {
> err = pdata->power_on(dev);
> if (err < 0)
> - return err;
> - }
> -
> - hcd = usb_create_hcd(&ohci_platform_hc_driver, &dev->dev,
> - dev_name(&dev->dev));
> - if (!hcd) {
> - err = -ENOMEM;
> - goto err_power;
> + goto err_put_clks;
> }
>
> hcd->rsrc_start = res_mem->start;
> @@ -102,21 +204,22 @@ static int ohci_platform_probe(struct
> platform_device *dev)
> hcd->regs = devm_ioremap_resource(&dev->dev, res_mem);
> if (IS_ERR(hcd->regs)) {
> err = PTR_ERR(hcd->regs);
> - goto err_put_hcd;
> + goto err_power;
> }
> err = usb_add_hcd(hcd, irq, IRQF_SHARED);
> if (err)
> - goto err_put_hcd;
> -
> - platform_set_drvdata(dev, hcd);
> + goto err_power;
>
> return err;
>
> -err_put_hcd:
> - usb_put_hcd(hcd);
> err_power:
> if (pdata->power_off)
> pdata->power_off(dev);
> +err_put_clks:
> + while (--clk >= 0)
> + clk_disable_unprepare(priv->clks[clk]);
Is this a typo? Since the label suggests you want clk_put here.
Besides, I think we should do the same thing in the remove callback, even
though clk_put is an empty function currently.
> +err_put_hcd:
> + usb_put_hcd(hcd);
>
> return err;
> }
> @@ -178,6 +281,12 @@ static int ohci_platform_resume(struct device *dev)
> #define ohci_platform_resume NULL
> #endif /* CONFIG_PM */
>
> +static const struct of_device_id ohci_platform_ids[] = {
> + { .compatible = "mmio-ohci", },
> + { }
> +};
> +MODULE_DEVICE_TABLE(of, ohci_platform_ids);
> +
> static const struct platform_device_id ohci_platform_table[] = {
> { "ohci-platform", 0 },
> { }
> @@ -198,6 +307,7 @@ static struct platform_driver ohci_platform_driver = {
> .owner = THIS_MODULE,
> .name = "ohci-platform",
> .pm = &ohci_platform_pm_ops,
> + .of_match_table = ohci_platform_ids,
> }
> };
>
> --
> 1.8.4.2
>
> --
> You received this message because you are subscribed to the Google Groups
> "linux-sunxi" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to [email protected].
> For more options, visit https://groups.google.com/groups/opt_out.
Regards,
Ma
--
You received this message because you are subscribed to the Google Groups
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.