linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kishon Vijay Abraham I <kishon@ti.com>
To: tony@atomide.com, balbi@ti.com, linux@arm.linux.org.uk,
	eballetbo@gmail.com, javier@dowhile0.org,
	gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	devicetree-discuss@lists.ozlabs.org
Cc: kishon@ti.com, Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH v1 5/6] usb: otg: add device tree support to otg library
Date: Tue, 22 Jan 2013 15:28:13 +0530	[thread overview]
Message-ID: <1358848694-20145-6-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1358848694-20145-1-git-send-email-kishon@ti.com>

Added an API devm_usb_get_phy_by_phandle(), to get usb phy by passing a
device node phandle value. This function will return a pointer to
the phy on success, -EPROBE_DEFER if there is a device_node for the phandle,
but the phy has not been added, or a ERR_PTR() otherwise.

Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/usb/otg/otg.c   |   77 +++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/usb/phy.h |    8 +++++
 2 files changed, 85 insertions(+)

diff --git a/drivers/usb/otg/otg.c b/drivers/usb/otg/otg.c
index 1f30b22..67daf8c 100644
--- a/drivers/usb/otg/otg.c
+++ b/drivers/usb/otg/otg.c
@@ -13,7 +13,9 @@
 #include <linux/export.h>
 #include <linux/err.h>
 #include <linux/device.h>
+#include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 
 #include <linux/usb/otg.h>
 
@@ -50,6 +52,20 @@ static struct usb_phy *__usb_find_phy_dev(struct device *dev,
 	return ERR_PTR(-ENODEV);
 }
 
+static struct usb_phy *__of_usb_find_phy(struct device_node *node)
+{
+	struct usb_phy  *phy;
+
+	list_for_each_entry(phy, &phy_list, head) {
+		if (node != phy->dev->of_node)
+			continue;
+
+		return phy;
+	}
+
+	return ERR_PTR(-ENODEV);
+}
+
 static void devm_usb_phy_release(struct device *dev, void *res)
 {
 	struct usb_phy *phy = *(struct usb_phy **)res;
@@ -125,6 +141,67 @@ err0:
 }
 EXPORT_SYMBOL(usb_get_phy);
 
+ /**
+ * devm_usb_get_phy_by_phandle - find the USB PHY by phandle
+ * @dev - device that requests this phy
+ * @phandle - name of the property holding the phy phandle value
+ * @index - the index of the phy
+ *
+ * Returns the phy driver associated with the given phandle value,
+ * after getting a refcount to it, -ENODEV if there is no such phy or
+ * -EPROBE_DEFER if there is a phandle to the phy, but the device is
+ * not yet loaded. While at that, it also associates the device with
+ * the phy using devres. On driver detach, release function is invoked
+ * on the devres data, then, devres data is freed.
+ *
+ * For use by USB host and peripheral drivers.
+ */
+struct usb_phy *devm_usb_get_phy_by_phandle(struct device *dev,
+	const char *phandle, u8 index)
+{
+	struct usb_phy	*phy = NULL, **ptr;
+	unsigned long	flags;
+	struct device_node *node;
+
+	if (!dev->of_node) {
+		dev_dbg(dev, "device does not have a device node entry\n");
+		return ERR_PTR(-EINVAL);
+	}
+
+	node = of_parse_phandle(dev->of_node, phandle, index);
+	if (!node) {
+		dev_dbg(dev, "failed to get %s phandle in %s node\n", phandle,
+			dev->of_node->full_name);
+		return ERR_PTR(-ENODEV);
+	}
+
+	ptr = devres_alloc(devm_usb_phy_release, sizeof(*ptr), GFP_KERNEL);
+	if (!ptr) {
+		dev_dbg(dev, "failed to allocate memory for devres\n");
+		return ERR_PTR(-ENOMEM);
+	}
+
+	spin_lock_irqsave(&phy_lock, flags);
+
+	phy = __of_usb_find_phy(node);
+	if (IS_ERR(phy) || !try_module_get(phy->dev->driver->owner)) {
+		phy = ERR_PTR(-EPROBE_DEFER);
+		devres_free(ptr);
+		goto err0;
+	}
+
+	*ptr = phy;
+	devres_add(dev, ptr);
+
+	get_device(phy->dev);
+
+err0:
+	spin_unlock_irqrestore(&phy_lock, flags);
+
+	return phy;
+}
+EXPORT_SYMBOL(devm_usb_get_phy_by_phandle);
+
 /**
  * usb_get_phy_dev - find the USB PHY
  * @dev - device that requests this phy
diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h
index 3a9ae3e..c7f5a98 100644
--- a/include/linux/usb/phy.h
+++ b/include/linux/usb/phy.h
@@ -167,6 +167,8 @@ extern struct usb_phy *devm_usb_get_phy(struct device *dev,
 	enum usb_phy_type type);
 extern struct usb_phy *usb_get_phy_dev(struct device *dev, u8 index);
 extern struct usb_phy *devm_usb_get_phy_dev(struct device *dev, u8 index);
+extern struct usb_phy *devm_usb_get_phy_by_phandle(struct device *dev,
+	const char *phandle, u8 index);
 extern void usb_put_phy(struct usb_phy *);
 extern void devm_usb_put_phy(struct device *dev, struct usb_phy *x);
 extern struct usb_phy_bind *usb_bind_phy(const char *dev_name, u8 index,
@@ -193,6 +195,12 @@ static inline struct usb_phy *devm_usb_get_phy_dev(struct device *dev, u8 index)
 	return NULL;
 }
 
+static inline struct usb_phy *devm_usb_get_phy_by_phandle(struct device *dev,
+	const char *phandle, u8 index)
+{
+	return NULL;
+}
+
 static inline void usb_put_phy(struct usb_phy *x)
 {
 }
-- 
1.7.9.5

  parent reply	other threads:[~2013-01-22  9:58 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-22  9:58 [PATCH v1 0/6] USB: Add support for multiple PHYs of same type Kishon Vijay Abraham I
2013-01-22  9:58 ` [PATCH v1 1/6] usb: otg: Add an API to bind the USB controller and PHY Kishon Vijay Abraham I
     [not found] ` <1358848694-20145-1-git-send-email-kishon-l0cyMroinI0@public.gmane.org>
2013-01-22  9:58   ` [PATCH v1 2/6] usb: otg: utils: add facilities in phy lib to support multiple PHYs of same type Kishon Vijay Abraham I
2013-01-22 14:07     ` Roger Quadros
     [not found]       ` <50FE9D1E.3010800-l0cyMroinI0@public.gmane.org>
2013-01-22 14:13         ` kishon
2013-01-22  9:58   ` [PATCH v1 3/6] ARM: OMAP: USB: Add phy binding information Kishon Vijay Abraham I
2013-01-22  9:58   ` [PATCH v1 4/6] drivers: usb: musb: omap: make use of the new PHY lib APIs Kishon Vijay Abraham I
2013-01-22 14:09     ` Roger Quadros
     [not found]       ` <50FE9DA6.4030507-l0cyMroinI0@public.gmane.org>
2013-01-24 18:58         ` kishon
2013-01-22  9:58   ` [PATCH v1 6/6] USB: MUSB: OMAP: get PHY by phandle for dt boot Kishon Vijay Abraham I
2013-01-22 14:17     ` Roger Quadros
     [not found]       ` <50FE9F5C.2010501-l0cyMroinI0@public.gmane.org>
2013-01-22 14:37         ` kishon
2013-01-22 14:47           ` Roger Quadros
2013-01-22 15:21             ` kishon
     [not found]               ` <50FEAE96.30706-l0cyMroinI0@public.gmane.org>
2013-01-22 15:38                 ` Peter Ujfalusi
     [not found]                   ` <50FEB275.80504-l0cyMroinI0@public.gmane.org>
2013-01-22 15:40                     ` kishon
2013-01-22 15:41   ` [PATCH v1 0/6] USB: Add support for multiple PHYs of same type Koen Kooi
2013-01-22 15:45     ` kishon
     [not found]       ` <50FEB3FD.3050001-l0cyMroinI0@public.gmane.org>
2013-01-22 16:16         ` kishon
     [not found]           ` <50FEBB61.9000707-l0cyMroinI0@public.gmane.org>
2013-01-22 17:02             ` Koen Kooi
     [not found]               ` <B9531499-0746-44DA-BDBB-999D4CA31E63-QLwJDigV5abLmq1fohREcCpxlwaOVQ5f@public.gmane.org>
2013-01-23  5:19                 ` kishon
2013-01-23 13:58               ` Mohammed, Afzal
     [not found]                 ` <C8443D0743D26F4388EA172BF4E2A7A93EA922F5-Er742YJ7I/eIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2013-01-23 14:26                   ` kishon
     [not found]                     ` <50FFF31D.2070908-l0cyMroinI0@public.gmane.org>
2013-01-24 11:51                       ` Mohammed, Afzal
2013-01-25 14:46                         ` Mohammed, Afzal
2013-01-22  9:58 ` Kishon Vijay Abraham I [this message]
2013-01-22 10:36   ` [PATCH v1 5/6] usb: otg: add device tree support to otg library Mark Rutland
     [not found]     ` <20130122103650.GB18876-NuALmloUBlrZROr8t4l/smS4ubULX0JqMm0uRHvK7Nw@public.gmane.org>
2013-01-22 15:37       ` kishon

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=1358848694-20145-6-git-send-email-kishon@ti.com \
    --to=kishon@ti.com \
    --cc=balbi@ti.com \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=eballetbo@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=javier@dowhile0.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=mkl@pengutronix.de \
    --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).