From: Roger Quadros <rogerq@ti.com> To: <balbi@ti.com> Cc: <tony@atomide.com>, <kishon@ti.com>, <george.cherian@ti.com>, <dmurphy@ti.com>, <linux-usb@vger.kernel.org>, <linux-omap@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Roger Quadros <rogerq@ti.com> Subject: [PATCH 2/7] usb: phy: omap-usb2: Don't use omap_get_control_dev() Date: Thu, 1 Aug 2013 17:05:10 +0300 [thread overview] Message-ID: <1375365915-21380-3-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1375365915-21380-1-git-send-email-rogerq@ti.com> omap_get_control_dev() is being deprecated as it doesn't support multiple instances. As control device is present only from OMAP4 onwards which supports DT only, we use phandles to get the reference to the control device. As we don't support non-DT boot, we just bail out on probe if device node is not present. Signed-off-by: Roger Quadros <rogerq@ti.com> --- drivers/usb/phy/phy-omap-usb2.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/usb/phy/phy-omap-usb2.c b/drivers/usb/phy/phy-omap-usb2.c index 376b367..77e0cf4 100644 --- a/drivers/usb/phy/phy-omap-usb2.c +++ b/drivers/usb/phy/phy-omap-usb2.c @@ -28,6 +28,7 @@ #include <linux/pm_runtime.h> #include <linux/delay.h> #include <linux/usb/omap_control_usb.h> +#include <linux/of_platform.h> /** * omap_usb2_set_comparator - links the comparator present in the sytem with @@ -124,6 +125,8 @@ static int omap_usb2_probe(struct platform_device *pdev) struct omap_usb *phy; struct usb_otg *otg; struct device_node *node = pdev->dev.of_node; + struct device_node *control_node; + struct platform_device *control_pdev; if (!node) return -ENODEV; @@ -148,11 +151,18 @@ static int omap_usb2_probe(struct platform_device *pdev) phy->phy.otg = otg; phy->phy.type = USB_PHY_TYPE_USB2; - phy->control_dev = omap_get_control_dev(); - if (IS_ERR(phy->control_dev)) { - dev_dbg(&pdev->dev, "Failed to get control device\n"); + control_node = of_parse_phandle(node, "ctrl-module", 0); + if (!control_node) { + dev_err(&pdev->dev, "Failed to get control device phandle\n"); return -ENODEV; } + control_pdev = of_find_device_by_node(control_node); + if (!control_pdev) { + dev_err(&pdev->dev, "Failed to get control device\n"); + return -ENODEV; + } + + phy->control_dev = &control_pdev->dev; phy->is_suspended = 1; omap_control_usb_phy_power(phy->control_dev, 0); -- 1.7.4.1
WARNING: multiple messages have this Message-ID (diff)
From: Roger Quadros <rogerq@ti.com> To: balbi@ti.com Cc: tony@atomide.com, kishon@ti.com, george.cherian@ti.com, dmurphy@ti.com, linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Roger Quadros <rogerq@ti.com> Subject: [PATCH 2/7] usb: phy: omap-usb2: Don't use omap_get_control_dev() Date: Thu, 1 Aug 2013 17:05:10 +0300 [thread overview] Message-ID: <1375365915-21380-3-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1375365915-21380-1-git-send-email-rogerq@ti.com> omap_get_control_dev() is being deprecated as it doesn't support multiple instances. As control device is present only from OMAP4 onwards which supports DT only, we use phandles to get the reference to the control device. As we don't support non-DT boot, we just bail out on probe if device node is not present. Signed-off-by: Roger Quadros <rogerq@ti.com> --- drivers/usb/phy/phy-omap-usb2.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/usb/phy/phy-omap-usb2.c b/drivers/usb/phy/phy-omap-usb2.c index 376b367..77e0cf4 100644 --- a/drivers/usb/phy/phy-omap-usb2.c +++ b/drivers/usb/phy/phy-omap-usb2.c @@ -28,6 +28,7 @@ #include <linux/pm_runtime.h> #include <linux/delay.h> #include <linux/usb/omap_control_usb.h> +#include <linux/of_platform.h> /** * omap_usb2_set_comparator - links the comparator present in the sytem with @@ -124,6 +125,8 @@ static int omap_usb2_probe(struct platform_device *pdev) struct omap_usb *phy; struct usb_otg *otg; struct device_node *node = pdev->dev.of_node; + struct device_node *control_node; + struct platform_device *control_pdev; if (!node) return -ENODEV; @@ -148,11 +151,18 @@ static int omap_usb2_probe(struct platform_device *pdev) phy->phy.otg = otg; phy->phy.type = USB_PHY_TYPE_USB2; - phy->control_dev = omap_get_control_dev(); - if (IS_ERR(phy->control_dev)) { - dev_dbg(&pdev->dev, "Failed to get control device\n"); + control_node = of_parse_phandle(node, "ctrl-module", 0); + if (!control_node) { + dev_err(&pdev->dev, "Failed to get control device phandle\n"); return -ENODEV; } + control_pdev = of_find_device_by_node(control_node); + if (!control_pdev) { + dev_err(&pdev->dev, "Failed to get control device\n"); + return -ENODEV; + } + + phy->control_dev = &control_pdev->dev; phy->is_suspended = 1; omap_control_usb_phy_power(phy->control_dev, 0); -- 1.7.4.1
next prev parent reply other threads:[~2013-08-01 14:07 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-08-01 14:05 [PATCH 0/7] phy: omap-usb: Support multiple instances and new types Roger Quadros 2013-08-01 14:05 ` Roger Quadros 2013-08-01 14:05 ` [PATCH 1/7] usb: phy: omap: Add new PHY types and remove omap_control_usb3_phy_power() Roger Quadros 2013-08-01 14:05 ` Roger Quadros 2013-08-06 11:45 ` Kishon Vijay Abraham I 2013-08-06 11:45 ` Kishon Vijay Abraham I 2013-08-06 13:26 ` Roger Quadros 2013-08-06 13:26 ` Roger Quadros 2013-08-01 14:05 ` Roger Quadros [this message] 2013-08-01 14:05 ` [PATCH 2/7] usb: phy: omap-usb2: Don't use omap_get_control_dev() Roger Quadros 2013-08-06 11:47 ` Kishon Vijay Abraham I 2013-08-06 11:47 ` Kishon Vijay Abraham I 2013-08-01 14:05 ` [PATCH 3/7] usb: phy: omap-usb3: " Roger Quadros 2013-08-01 14:05 ` Roger Quadros 2013-08-06 11:48 ` Kishon Vijay Abraham I 2013-08-06 11:48 ` Kishon Vijay Abraham I 2013-08-01 14:05 ` [PATCH 4/7] usb: musb: omap2430: " Roger Quadros 2013-08-01 14:05 ` Roger Quadros 2013-08-06 11:51 ` Kishon Vijay Abraham I 2013-08-06 11:51 ` Kishon Vijay Abraham I 2013-08-06 13:27 ` Roger Quadros 2013-08-06 13:27 ` Roger Quadros 2013-08-01 14:05 ` [PATCH 5/7] usb: phy: omap: get rid of omap_get_control_dev() Roger Quadros 2013-08-01 14:05 ` Roger Quadros 2013-08-06 11:52 ` Kishon Vijay Abraham I 2013-08-06 11:52 ` Kishon Vijay Abraham I 2013-08-01 14:05 ` [PATCH 6/7] ARM: dts: omap4: update omap-control-usb nodes Roger Quadros 2013-08-01 14:05 ` Roger Quadros 2013-08-14 7:45 ` Roger Quadros 2013-08-14 7:45 ` Roger Quadros 2013-08-14 8:41 ` Benoit Cousson 2013-08-14 9:04 ` Roger Quadros 2013-08-14 9:04 ` Roger Quadros 2013-08-01 14:05 ` [PATCH 7/7] ARM: dts: omap5: update omap-control-usb node Roger Quadros 2013-08-01 14:05 ` Roger Quadros 2013-08-14 7:45 ` Roger Quadros 2013-08-14 7:45 ` Roger Quadros 2013-08-14 7:44 ` [PATCH 0/7] phy: omap-usb: Support multiple instances and new types Roger Quadros 2013-08-14 7:44 ` Roger Quadros 2013-08-14 7:44 ` Roger Quadros
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=1375365915-21380-3-git-send-email-rogerq@ti.com \ --to=rogerq@ti.com \ --cc=balbi@ti.com \ --cc=devicetree@vger.kernel.org \ --cc=dmurphy@ti.com \ --cc=george.cherian@ti.com \ --cc=kishon@ti.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-usb@vger.kernel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.