Hi, On Sat, Mar 01, 2014 at 04:07:53AM +0300, Sergei Shtylyov wrote: > Add support of the device tree probing for the Renesas R-Car generation 2 SoCs > documenting the device tree binding as necessary. > > Signed-off-by: Sergei Shtylyov <[email protected]>
Unless someone on devicetree@vger gives me an ACK pretty soon, I'm
afraid this patch will miss v3.15.
>
> ---
> This patch is against the 'next' branch of Felipe Balbi's 'usb.git' repo.
>
> Changes in version 2:
> - restored devm_clk_get() call and the error handling logic in the probe()
> method, removed clk_put() call in the remove() method.
>
> Documentation/devicetree/bindings/usb/rcar-gen2-phy.txt | 29 +++++++++++
> drivers/usb/phy/phy-rcar-gen2-usb.c | 42
> ++++++++++++++--
> 2 files changed, 68 insertions(+), 3 deletions(-)
>
> Index: usb/Documentation/devicetree/bindings/usb/rcar-gen2-phy.txt
> ===================================================================
> --- /dev/null
> +++ usb/Documentation/devicetree/bindings/usb/rcar-gen2-phy.txt
> @@ -0,0 +1,29 @@
> +* Renesas R-Car generation 2 USB PHY
> +
> +This file provides information on what the device node for the R-Car
> generation
> +2 USB PHY contains.
> +
> +Required properties:
> +- compatible: "renesas,usb-phy-r8a7790" if the device is a part of R8A7790
> SoC.
> + "renesas,usb-phy-r8a7791" if the device is a part of R8A7791 SoC.
> +- reg: offset and length of the register block.
> +- clocks: clock phandle and specifier pair.
> +- clock-names: string, clock input name, must be "usbhs".
> +
> +Optional properties:
> +- renesas,channel0-pci: boolean, specify when USB channel 0 should be
> connected
> + to PCI EHCI/OHCI; otherwise, it will be connected to the
> + USBHS controller.
> +- renesas,channel2-pci: boolean, specify when USB channel 2 should be
> connected
> + to PCI EHCI/OHCI; otherwise, it will be connected to the
> + USBSS controller (xHCI).
I wonder if these two properties should be taken care by pinctrl
framework instead.
> +
> +Example (Lager board):
> +
> + usb-phy@e6590100 {
> + compatible = "renesas,usb-phy-r8a7790";
> + reg = <0 0xe6590100 0 0x100>;
> + clocks = <&mstp7_clks R8A7790_CLK_HSUSB>;
> + clock-names = "usbhs";
> + renesas,channel2-pci;
> + };
> Index: usb/drivers/usb/phy/phy-rcar-gen2-usb.c
> ===================================================================
> --- usb.orig/drivers/usb/phy/phy-rcar-gen2-usb.c
> +++ usb/drivers/usb/phy/phy-rcar-gen2-usb.c
> @@ -1,8 +1,8 @@
> /*
> * Renesas R-Car Gen2 USB phy driver
> *
> - * Copyright (C) 2013 Renesas Solutions Corp.
> - * Copyright (C) 2013 Cogent Embedded, Inc.
> + * Copyright (C) 2013-2014 Renesas Solutions Corp.
> + * Copyright (C) 2013-2014 Cogent Embedded, Inc.
> *
> * This program is free software; you can redistribute it and/or modify
> * it under the terms of the GNU General Public License version 2 as
> @@ -13,6 +13,7 @@
> #include <linux/delay.h>
> #include <linux/io.h>
> #include <linux/module.h>
> +#include <linux/of.h>
> #include <linux/platform_data/usb-rcar-gen2-phy.h>
> #include <linux/platform_device.h>
> #include <linux/spinlock.h>
> @@ -167,6 +168,37 @@ out:
> spin_unlock_irqrestore(&priv->lock, flags);
> }
>
> +#ifdef CONFIG_OF
> +static struct rcar_gen2_phy_platform_data *
> +rcar_gen2_usb_phy_parse_dt(struct device *dev)
> +{
> + struct device_node *np = dev->of_node;
> + struct rcar_gen2_phy_platform_data *pdata;
> +
> + pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
> + if (!pdata)
> + return NULL;
> +
> + pdata->chan0_pci = of_property_read_bool(np, "renesas,channel0-pci");
> + pdata->chan2_pci = of_property_read_bool(np, "renesas,channel2-pci");
> +
> + return pdata;
> +}
> +
> +static const struct of_device_id rcar_gen2_usb_phy_match_table[] = {
> + { .compatible = "renesas,usb-phy-r8a7790" },
> + { .compatible = "renesas,usb-phy-r8a7791" },
> + { }
> +};
> +MODULE_DEVICE_TABLE(of, rcar_gen2_usb_phy_match_table);
> +#else
> +static inline struct rcar_gen2_phy_platform_data *
> +rcar_gen2_usb_phy_parse_dt(struct device *dev)
> +{
> + return NULL;
> +}
> +#endif
> +
> static int rcar_gen2_usb_phy_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -177,7 +209,10 @@ static int rcar_gen2_usb_phy_probe(struc
> struct clk *clk;
> int retval;
>
> - pdata = dev_get_platdata(dev);
> + if (dev->of_node)
> + pdata = rcar_gen2_usb_phy_parse_dt(dev);
> + else
> + pdata = dev_get_platdata(dev);
> if (!pdata) {
> dev_err(dev, "No platform data\n");
> return -EINVAL;
> @@ -236,6 +271,7 @@ static int rcar_gen2_usb_phy_remove(stru
> static struct platform_driver rcar_gen2_usb_phy_driver = {
> .driver = {
> .name = "usb_phy_rcar_gen2",
> + .of_match_table = of_match_ptr(rcar_gen2_usb_phy_match_table),
> },
> .probe = rcar_gen2_usb_phy_probe,
> .remove = rcar_gen2_usb_phy_remove,
--
balbi
signature.asc
Description: Digital signature
