From mboxrd@z Thu Jan 1 00:00:00 1970 From: George Cherian Subject: [PATCH] phy: omap: Adapt phy-omap-usb2 for AM437x Date: Mon, 14 Oct 2013 18:13:23 +0530 Message-ID: <1381754603-11581-1-git-send-email-george.cherian@ti.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Sender: linux-doc-owner@vger.kernel.org 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 List-Id: devicetree@vger.kernel.org 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 --- 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 #include #include +#include #include /** @@ -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