From: Roger Quadros <rogerq@ti.com> To: <peter.chen@freescale.com> Cc: <balbi@kernel.org>, <tony@atomide.com>, <gregkh@linuxfoundation.org>, <dan.j.williams@intel.com>, <mathias.nyman@linux.intel.com>, <Joao.Pinto@synopsys.com>, <sergei.shtylyov@cogentembedded.com>, <jun.li@freescale.com>, <grygorii.strashko@ti.com>, <yoshihiro.shimoda.uh@renesas.com>, <robh@kernel.org>, <nsekhar@ti.com>, <b-liu@ti.com>, <linux-usb@vger.kernel.org>, <linux-omap@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>, Roger Quadros <rogerq@ti.com> Subject: [PATCH v9 09/14] usb: of: add an API to get OTG device from USB controller node Date: Wed, 8 Jun 2016 12:03:41 +0300 [thread overview] Message-ID: <1465376626-30122-10-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1465376626-30122-1-git-send-email-rogerq@ti.com> The OTG controller and the USB controller can be linked via the 'otg-controller' property in the USB controller's device node. of_usb_get_otg() can be used to get the OTG controller device from the USB controller's device node. Signed-off-by: Roger Quadros <rogerq@ti.com> Acked-by: Peter Chen <peter.chen@nxp.com> Acked-by: Rob Herring <robh@kernel.org> --- Documentation/devicetree/bindings/usb/generic.txt | 3 +++ drivers/usb/common/common.c | 27 +++++++++++++++++++++++ include/linux/usb/of.h | 9 ++++++++ 3 files changed, 39 insertions(+) diff --git a/Documentation/devicetree/bindings/usb/generic.txt b/Documentation/devicetree/bindings/usb/generic.txt index bba8257..f6866c1 100644 --- a/Documentation/devicetree/bindings/usb/generic.txt +++ b/Documentation/devicetree/bindings/usb/generic.txt @@ -24,6 +24,9 @@ Optional properties: optional for OTG device. - adp-disable: tells OTG controllers we want to disable OTG ADP, ADP is optional for OTG device. + - otg-controller: phandle to otg controller. Host or gadget controllers can + contain this property to link it to a particular OTG + controller. This is an attribute to a USB controller such as: diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c index e3d0161..d7ec471 100644 --- a/drivers/usb/common/common.c +++ b/drivers/usb/common/common.c @@ -238,6 +238,33 @@ int of_usb_update_otg_caps(struct device_node *np, } EXPORT_SYMBOL_GPL(of_usb_update_otg_caps); +#ifdef CONFIG_USB_OTG +/** + * of_usb_get_otg - get the OTG controller linked to the USB controller + * @np: Pointer to the device_node of the USB controller + * @otg_caps: Pointer to the target usb_otg_caps to be set + * + * Returns the OTG controller device or NULL on error. + */ +struct device *of_usb_get_otg(struct device_node *np) +{ + struct device_node *otg_np; + struct platform_device *pdev; + + otg_np = of_parse_phandle(np, "otg-controller", 0); + if (!otg_np) + return NULL; + + pdev = of_find_device_by_node(otg_np); + of_node_put(otg_np); + if (!pdev) + return NULL; + + return &pdev->dev; +} +EXPORT_SYMBOL_GPL(of_usb_get_otg); +#endif + #endif MODULE_LICENSE("GPL"); diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h index de3237f..499a4e8 100644 --- a/include/linux/usb/of.h +++ b/include/linux/usb/of.h @@ -40,6 +40,15 @@ static inline struct device_node *usb_of_get_child_node } #endif +#if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_USB_OTG) +struct device *of_usb_get_otg(struct device_node *np); +#else +static inline struct device *of_usb_get_otg(struct device_node *np) +{ + return NULL; +} +#endif + #if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_USB_SUPPORT) enum usb_phy_interface of_usb_get_phy_mode(struct device_node *np); #else -- 2.7.4
next prev parent reply other threads:[~2016-06-08 9:04 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-08 9:03 [PATCH v9 00/14] USB OTG/dual-role framework Roger Quadros 2016-06-08 9:03 ` [PATCH v9 01/14] usb: hcd: Initialize hcd->flags to 0 Roger Quadros 2016-06-08 9:03 ` [PATCH v9 02/14] usb: otg-fsm: Prevent build warning "VDBG" redefined Roger Quadros 2016-06-08 9:03 ` [PATCH v9 03/14] usb: hcd.h: Add OTG to HCD interface Roger Quadros 2016-06-08 11:39 ` Sergei Shtylyov 2016-06-08 12:04 ` Roger Quadros 2016-06-08 12:10 ` Sergei Shtylyov 2016-06-09 7:31 ` Roger Quadros 2016-06-09 10:16 ` Sergei Shtylyov 2016-06-09 14:11 ` Alan Stern 2016-06-10 7:01 ` Roger Quadros 2016-06-09 7:51 ` [PATCH v10 " Roger Quadros 2016-06-08 9:03 ` [PATCH v9 04/14] usb: otg-fsm: use usb_otg wherever possible Roger Quadros 2016-06-08 9:03 ` [PATCH v9 05/14] usb: otg-fsm: move host controller operations into usb_otg->hcd_ops Roger Quadros 2016-06-08 9:03 ` [PATCH v9 06/14] usb: gadget.h: Add OTG to gadget interface Roger Quadros 2016-06-08 9:03 ` [PATCH v9 07/14] usb: otg: get rid of CONFIG_USB_OTG_FSM in favour of CONFIG_USB_OTG Roger Quadros 2016-06-08 9:03 ` [PATCH v9 08/14] usb: otg: add OTG/dual-role core Roger Quadros 2016-06-08 9:53 ` Peter Chen 2016-06-08 10:12 ` Roger Quadros 2016-06-08 12:42 ` Peter Chen 2016-06-09 7:24 ` Roger Quadros 2016-06-12 6:26 ` Peter Chen 2016-06-12 10:56 ` Peter Chen 2016-06-09 7:53 ` [PATCH v10 " Roger Quadros 2016-06-09 12:34 ` Sergei Shtylyov 2016-06-10 7:04 ` Roger Quadros 2016-06-10 10:19 ` Roger Quadros 2016-06-10 10:44 ` Sergei Shtylyov 2016-06-10 10:54 ` Roger Quadros 2016-06-10 11:02 ` Felipe Balbi 2016-06-08 9:03 ` Roger Quadros [this message] 2016-06-08 9:03 ` [PATCH v9 10/14] usb: otg: add hcd companion support Roger Quadros 2016-06-08 9:03 ` [PATCH v9 11/14] usb: otg: use dev_dbg() instead of VDBG() Roger Quadros 2016-06-08 15:10 ` Joe Perches 2016-06-09 7:25 ` Roger Quadros 2016-06-09 7:55 ` [PATCH v10 " Roger Quadros 2016-06-09 15:43 ` Joe Perches 2016-06-10 7:05 ` Roger Quadros 2016-06-08 9:03 ` [PATCH v9 12/14] usb: hcd: Adapt to OTG core Roger Quadros 2016-06-08 11:42 ` Sergei Shtylyov 2016-06-08 12:06 ` Roger Quadros 2016-06-08 12:11 ` Sergei Shtylyov 2016-06-09 7:27 ` Roger Quadros 2016-06-08 9:03 ` [PATCH v9 13/14] usb: gadget: udc: adapt " Roger Quadros 2016-06-09 10:49 ` Yoshihiro Shimoda 2016-06-10 7:06 ` Roger Quadros 2016-06-08 9:03 ` [PATCH v9 14/14] usb: host: xhci-plat: Add otg device to platform data Roger Quadros 2016-06-09 5:27 ` [PATCH v9 00/14] USB OTG/dual-role framework Peter Chen 2016-06-09 7:30 ` Roger Quadros 2016-06-09 10:13 ` Yoshihiro Shimoda -- strict thread matches above, loose matches on Subject: below -- 2016-05-13 10:03 [PATCH v8 " Roger Quadros 2016-05-13 10:03 ` [PATCH v8 09/14] usb: of: add an API to get OTG device from USB controller node Roger Quadros 2016-05-20 9:29 ` [PATCH v9 " Roger Quadros 2016-05-23 21:06 ` Rob Herring
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=1465376626-30122-10-git-send-email-rogerq@ti.com \ --to=rogerq@ti.com \ --cc=Joao.Pinto@synopsys.com \ --cc=b-liu@ti.com \ --cc=balbi@kernel.org \ --cc=dan.j.williams@intel.com \ --cc=devicetree@vger.kernel.org \ --cc=gregkh@linuxfoundation.org \ --cc=grygorii.strashko@ti.com \ --cc=jun.li@freescale.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=mathias.nyman@linux.intel.com \ --cc=nsekhar@ti.com \ --cc=peter.chen@freescale.com \ --cc=robh@kernel.org \ --cc=sergei.shtylyov@cogentembedded.com \ --cc=tony@atomide.com \ --cc=yoshihiro.shimoda.uh@renesas.com \ --subject='Re: [PATCH v9 09/14] usb: of: add an API to get OTG device from USB controller node' \ /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
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).