devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: George Cherian <george.cherian@ti.com>
To: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
	devicetree@vger.kernel.org
Cc: tony@atomide.com, balbi@ti.com, kishon@ti.com, rob@landley.net,
	ijc+devicetree@hellion.org.uk, swarren@wwwdotorg.org,
	mark.rutland@arm.com, pawel.moll@arm.com,
	rob.herring@calxeda.com, George Cherian <george.cherian@ti.com>
Subject: [PATCH] phy: omap: Adapt phy-omap-usb2 for AM437x
Date: Mon, 14 Oct 2013 18:13:23 +0530	[thread overview]
Message-ID: <1381754603-11581-1-git-send-email-george.cherian@ti.com> (raw)

This patch adds a compatible for AM437x "ti,am43xx-usb2" to
reuse the same phy-omap-usb2 driver.

Also updated the documentation to add the new compatible.

Signed-off-by: George Cherian <george.cherian@ti.com>
---
 Documentation/devicetree/bindings/usb/usb-phy.txt |  2 +-
 drivers/phy/phy-omap-usb2.c                       | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/usb/usb-phy.txt b/Documentation/devicetree/bindings/usb/usb-phy.txt
index c0245c8..d5a7f21 100644
--- a/Documentation/devicetree/bindings/usb/usb-phy.txt
+++ b/Documentation/devicetree/bindings/usb/usb-phy.txt
@@ -3,7 +3,7 @@ USB PHY
 OMAP USB2 PHY
 
 Required properties:
- - compatible: Should be "ti,omap-usb2"
+ - compatible: Should be "ti,omap-usb2" or "ti,am437x-usb2"
  - reg : Address and length of the register set for the device.
  - #phy-cells: determine the number of cells that should be given in the
    phandle while referencing this phy.
diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c
index bfc5c33..0529c83 100644
--- a/drivers/phy/phy-omap-usb2.c
+++ b/drivers/phy/phy-omap-usb2.c
@@ -29,6 +29,7 @@
 #include <linux/delay.h>
 #include <linux/usb/omap_control_usb.h>
 #include <linux/phy/phy.h>
+#include <linux/of.h>
 #include <linux/of_platform.h>
 
 /**
@@ -172,7 +173,10 @@ static int omap_usb2_probe(struct platform_device *pdev)
 	phy->dev		= &pdev->dev;
 
 	phy->phy.dev		= phy->dev;
-	phy->phy.label		= "omap-usb2";
+	if (of_device_is_compatible(node, "ti,am437x-usb2"))
+		phy->phy.label		= "am437x-usb2";
+	else
+		phy->phy.label		= "omap-usb2";
 	phy->phy.set_suspend	= omap_usb2_suspend;
 	phy->phy.otg		= otg;
 	phy->phy.type		= USB_PHY_TYPE_USB2;
@@ -201,8 +205,10 @@ static int omap_usb2_probe(struct platform_device *pdev)
 
 	otg->set_host		= omap_usb_set_host;
 	otg->set_peripheral	= omap_usb_set_peripheral;
-	otg->set_vbus		= omap_usb_set_vbus;
-	otg->start_srp		= omap_usb_start_srp;
+	if (of_device_is_compatible(node, "ti,omap-usb2")) {
+		otg->set_vbus		= omap_usb_set_vbus;
+		otg->start_srp		= omap_usb_start_srp;
+	}
 	otg->phy		= &phy->phy;
 
 	platform_set_drvdata(pdev, phy);
@@ -300,6 +306,7 @@ static const struct dev_pm_ops omap_usb2_pm_ops = {
 #ifdef CONFIG_OF
 static const struct of_device_id omap_usb2_id_table[] = {
 	{ .compatible = "ti,omap-usb2" },
+	{ .compatible = "ti,am437x-usb2" },
 	{}
 };
 MODULE_DEVICE_TABLE(of, omap_usb2_id_table);
-- 
1.8.1


             reply	other threads:[~2013-10-14 12:43 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-14 12:43 George Cherian [this message]
2013-10-14 14:33 ` [PATCH] phy: omap: Adapt phy-omap-usb2 for AM437x Mark Rutland
2013-10-15  7:05   ` George Cherian
2013-10-15 13:22     ` Felipe Balbi

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=1381754603-11581-1-git-send-email-george.cherian@ti.com \
    --to=george.cherian@ti.com \
    --cc=balbi@ti.com \
    --cc=devicetree@vger.kernel.org \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=kishon@ti.com \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=pawel.moll@arm.com \
    --cc=rob.herring@calxeda.com \
    --cc=rob@landley.net \
    --cc=swarren@wwwdotorg.org \
    --cc=tony@atomide.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).