From: Felipe Balbi <balbi@ti.com>
To: Ben Dooks <ben.dooks@codethink.co.uk>
Cc: linux-kernel@lists.codethink.co.uk, linux-usb@vger.kernel.org,
linux-sh@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>,
Simon Horman <horms@verge.net.au>,
devicetree@vger.kernel.org
Subject: Re: [PATCH] phy-rcar-usb-gen2: add device tree support
Date: Mon, 27 Jan 2014 15:33:22 +0000 [thread overview]
Message-ID: <20140127153322.GB13268@saruman.home> (raw)
In-Reply-To: <1390755901-3743-1-git-send-email-ben.dooks@codethink.co.uk>
[-- Attachment #1: Type: text/plain, Size: 3950 bytes --]
Hi,
On Sun, Jan 26, 2014 at 05:05:01PM +0000, Ben Dooks wrote:
> Add support for the phy-rcar-gen2-usb driver to be probed from device tree.
>
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
> Reviewed-by: Ian Molton <ian.molton@codethink.co.uk>
> ---
> Fixes from v2:
> - fix missing of_if patch
> (I clearly should not be let near git-rebase when hungry)
>
> Fixes from v1:
> - use of_property_reasd-bool()
> - remove unused of_id variable
>
> Cc: linux-usb@vger.kernel.org
> Cc: linux-sh@vger.kernel.org
> Cc: Magnus Damm <magnus.damm@gmail.com>
> Cc: Simon Horman <horms@verge.net.au>
> Cc: devicetree@vger.kernel.org
it's a good practice to Cc maintainers ;-)
patch looks good to me, but I'd like to get an Ack from one of DT
maintainers
> ---
> drivers/usb/phy/phy-rcar-gen2-usb.c | 31 ++++++++++++++++++++++++++-----
> 1 file changed, 26 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/phy/phy-rcar-gen2-usb.c b/drivers/usb/phy/phy-rcar-gen2-usb.c
> index db3ab34..e4665b9 100644
> --- a/drivers/usb/phy/phy-rcar-gen2-usb.c
> +++ b/drivers/usb/phy/phy-rcar-gen2-usb.c
> @@ -15,6 +15,7 @@
> #include <linux/module.h>
> #include <linux/platform_data/usb-rcar-gen2-phy.h>
> #include <linux/platform_device.h>
> +#include <linux/of_device.h>
> #include <linux/spinlock.h>
> #include <linux/usb/otg.h>
>
> @@ -167,6 +168,12 @@ out:
> spin_unlock_irqrestore(&priv->lock, flags);
> }
>
> +static struct of_device_id rcar_gen2_usb_phy_ofmatch[] = {
> + { .compatible = "renesas,usb-phy-r8a7790", },
> + { .compatible = "renesas,rcar-gen2-usb-phy", },
> + { },
> +};
> +
> static int rcar_gen2_usb_phy_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -178,7 +185,7 @@ static int rcar_gen2_usb_phy_probe(struct platform_device *pdev)
> int retval;
>
> pdata = dev_get_platdata(&pdev->dev);
> - if (!pdata) {
> + if (!pdata && !dev->of_node) {
> dev_err(dev, "No platform data\n");
> return -EINVAL;
> }
> @@ -203,16 +210,29 @@ static int rcar_gen2_usb_phy_probe(struct platform_device *pdev)
> spin_lock_init(&priv->lock);
> priv->clk = clk;
> priv->base = base;
> - priv->ugctrl2 = pdata->chan0_pci ?
> - USBHS_UGCTRL2_USB0_PCI : USBHS_UGCTRL2_USB0_HS;
> - priv->ugctrl2 |= pdata->chan2_pci ?
> - USBHS_UGCTRL2_USB2_PCI : USBHS_UGCTRL2_USB2_SS;
> priv->phy.dev = dev;
> priv->phy.label = dev_name(dev);
> priv->phy.init = rcar_gen2_usb_phy_init;
> priv->phy.shutdown = rcar_gen2_usb_phy_shutdown;
> priv->phy.set_suspend = rcar_gen2_usb_phy_set_suspend;
>
> + if (dev->of_node) {
> + if (of_property_read_bool(dev->of_node, "renesas,usb0-hs"))
> + priv->ugctrl2 = USBHS_UGCTRL2_USB0_HS;
> + else
> + priv->ugctrl2 = USBHS_UGCTRL2_USB0_PCI;
> +
> + if (of_property_read_bool(dev->of_node, "renesas,usb2-ss"))
> + priv->ugctrl2 |= USBHS_UGCTRL2_USB2_SS;
> + else
> + priv->ugctrl2 |= USBHS_UGCTRL2_USB2_PCI;
> + } else {
> + priv->ugctrl2 = pdata->chan0_pci ?
> + USBHS_UGCTRL2_USB0_PCI : USBHS_UGCTRL2_USB0_HS;
> + priv->ugctrl2 |= pdata->chan2_pci ?
> + USBHS_UGCTRL2_USB2_PCI : USBHS_UGCTRL2_USB2_SS;
> + }
> +
> retval = usb_add_phy(&priv->phy, USB_PHY_TYPE_USB2);
> if (retval < 0) {
> dev_err(dev, "Failed to add USB phy\n");
> @@ -236,6 +256,7 @@ static int rcar_gen2_usb_phy_remove(struct platform_device *pdev)
> static struct platform_driver rcar_gen2_usb_phy_driver = {
> .driver = {
> .name = "usb_phy_rcar_gen2",
> + .of_match_table = rcar_gen2_usb_phy_ofmatch,
> },
> .probe = rcar_gen2_usb_phy_probe,
> .remove = rcar_gen2_usb_phy_remove,
> --
> 1.8.5.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-01-27 15:33 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1390754945-28142-1-git-send-email-ben.dooks@codethink.co.uk>
2014-01-26 16:48 ` [PATCH 1/8] pci-rcar-gen2: add of match table Ben Dooks
2014-01-27 12:48 ` Sergei Shtylyov
2014-01-27 13:27 ` Ben Dooks
2014-01-29 6:17 ` Simon Horman
2014-01-29 10:06 ` Geert Uytterhoeven
2014-01-29 12:20 ` Simon Horman
2014-01-26 16:48 ` [PATCH 2/8] pci-rcar-gen2: add initial device tree documentation Ben Dooks
2014-01-26 19:09 ` Geert Uytterhoeven
2014-01-27 12:07 ` Ben Dooks
2014-01-27 13:31 ` Sergei Shtylyov
2014-01-27 13:33 ` Ben Dooks
2014-01-27 17:13 ` Sergei Shtylyov
2014-01-26 16:49 ` [PATCH 3/8] ARM: shmbobile: r8a7790.dtsi: add pci0/1/2 nodes Ben Dooks
2014-01-26 16:49 ` [PATCH 5/8] phy-rcar-usb-gen2: add device tree support Ben Dooks
[not found] ` <1390754945-28142-6-git-send-email-ben.dooks-4yDnlxn2s6sWdaTGBSpHTA@public.gmane.org>
2014-01-26 17:04 ` Sergei Shtylyov
2014-01-26 17:08 ` Ben Dooks
2014-01-26 17:05 ` [PATCH] " Ben Dooks
2014-01-27 15:33 ` Felipe Balbi [this message]
2014-01-27 17:23 ` Sergei Shtylyov
2014-01-27 19:06 ` Ben Dooks
[not found] ` <52E6AE32.5050906-4yDnlxn2s6sWdaTGBSpHTA@public.gmane.org>
2014-01-29 6:22 ` Simon Horman
[not found] ` <20140129062212.GD23833-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
2014-01-29 10:41 ` Sergei Shtylyov
2014-01-29 12:22 ` Simon Horman
[not found] ` <20140129122202.GB26253-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
2014-01-29 12:26 ` Sergei Shtylyov
[not found] ` <52E8F38F.9030609-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>
2014-01-29 12:35 ` Simon Horman
2014-01-26 16:49 ` [PATCH 6/8] phy-rcar-usb-gen2: add device tree documentation Ben Dooks
2014-01-26 19:07 ` Geert Uytterhoeven
2014-01-26 16:49 ` [PATCH 7/8] ARM: shmobile: r8a7790.dtsi: add usbphy node Ben Dooks
[not found] ` <1390754945-28142-1-git-send-email-ben.dooks-4yDnlxn2s6sWdaTGBSpHTA@public.gmane.org>
2014-01-26 16:49 ` [PATCH 4/8] ARM: shmobile: lager.dts: add pci 0/1/2 Ben Dooks
2014-01-26 16:49 ` [PATCH 8/8] ARM: shmobile: lager.dtb: add usbphy reference Ben Dooks
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140127153322.GB13268@saruman.home \
--to=balbi@ti.com \
--cc=ben.dooks@codethink.co.uk \
--cc=devicetree@vger.kernel.org \
--cc=horms@verge.net.au \
--cc=linux-kernel@lists.codethink.co.uk \
--cc=linux-sh@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=magnus.damm@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).