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>,
<joe@perches.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 v10 14/14] usb: host: xhci-plat: Add otg device to platform data
Date: Fri, 10 Jun 2016 16:07:23 +0300 [thread overview]
Message-ID: <1465564043-27163-15-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1465564043-27163-1-git-send-email-rogerq@ti.com>
Host controllers that are part of an OTG/dual-role instance
need to somehow pass the OTG controller device information
to the HCD core.
We use platform data to pass the OTG controller device.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Reviewed-by: Peter Chen <peter.chen@nxp.com>
---
drivers/usb/host/xhci-plat.c | 35 ++++++++++++++++++++++++++++-------
include/linux/usb/xhci_pdriver.h | 3 +++
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 676ea45..24d030a 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -239,11 +239,20 @@ static int xhci_plat_probe(struct platform_device *pdev)
goto put_usb3_hcd;
}
- ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
+ if (pdata && pdata->otg_dev)
+ ret = usb_otg_add_hcd(hcd, irq, IRQF_SHARED, pdata->otg_dev);
+ else
+ ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
+
if (ret)
goto disable_usb_phy;
- ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED);
+ if (pdata && pdata->otg_dev)
+ ret = usb_otg_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED,
+ pdata->otg_dev);
+ else
+ ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED);
+
if (ret)
goto dealloc_usb2_hcd;
@@ -251,7 +260,10 @@ static int xhci_plat_probe(struct platform_device *pdev)
dealloc_usb2_hcd:
- usb_remove_hcd(hcd);
+ if (pdata && pdata->otg_dev)
+ usb_otg_remove_hcd(hcd);
+ else
+ usb_remove_hcd(hcd);
disable_usb_phy:
usb_phy_shutdown(hcd->usb_phy);
@@ -269,16 +281,25 @@ put_hcd:
return ret;
}
-static int xhci_plat_remove(struct platform_device *dev)
+static int xhci_plat_remove(struct platform_device *pdev)
{
- struct usb_hcd *hcd = platform_get_drvdata(dev);
+ struct usb_hcd *hcd = platform_get_drvdata(pdev);
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
struct clk *clk = xhci->clk;
+ struct usb_xhci_pdata *pdata = dev_get_platdata(&pdev->dev);
+
+ if (pdata && pdata->otg_dev)
+ usb_otg_remove_hcd(xhci->shared_hcd);
+ else
+ usb_remove_hcd(xhci->shared_hcd);
- usb_remove_hcd(xhci->shared_hcd);
usb_phy_shutdown(hcd->usb_phy);
- usb_remove_hcd(hcd);
+ if (pdata && pdata->otg_dev)
+ usb_otg_remove_hcd(hcd);
+ else
+ usb_remove_hcd(hcd);
+
usb_put_hcd(xhci->shared_hcd);
if (!IS_ERR(clk))
diff --git a/include/linux/usb/xhci_pdriver.h b/include/linux/usb/xhci_pdriver.h
index 376654b..5c68b83 100644
--- a/include/linux/usb/xhci_pdriver.h
+++ b/include/linux/usb/xhci_pdriver.h
@@ -18,10 +18,13 @@
*
* @usb3_lpm_capable: determines if this xhci platform supports USB3
* LPM capability
+ * @otg_dev: OTG controller device. Only requied if part of
+ * OTG/dual-role.
*
*/
struct usb_xhci_pdata {
unsigned usb3_lpm_capable:1;
+ struct device *otg_dev;
};
#endif /* __USB_CORE_XHCI_PDRIVER_H */
--
2.7.4
next prev parent reply other threads:[~2016-06-10 13:08 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-10 13:07 [PATCH v10 00/14] USB OTG/dual-role framework Roger Quadros
2016-06-10 13:07 ` [PATCH v10 01/14] usb: hcd: Initialize hcd->flags to 0 Roger Quadros
2016-06-14 8:16 ` Roger Quadros
2016-06-10 13:07 ` [PATCH v10 02/14] usb: otg-fsm: Prevent build warning "VDBG" redefined Roger Quadros
2016-06-10 13:07 ` [PATCH v10 03/14] usb: hcd.h: Add OTG to HCD interface Roger Quadros
2016-06-14 8:17 ` Roger Quadros
2016-06-14 14:21 ` Alan Stern
2016-06-15 7:14 ` Roger Quadros
2016-06-10 13:07 ` [PATCH v10 04/14] usb: otg-fsm: use usb_otg wherever possible Roger Quadros
2016-06-10 13:07 ` [PATCH v10 05/14] usb: otg-fsm: move host controller operations into usb_otg->hcd_ops Roger Quadros
2016-06-10 13:07 ` [PATCH v10 06/14] usb: gadget.h: Add OTG to gadget interface Roger Quadros
2016-06-12 9:13 ` Peter Chen
2016-06-20 7:21 ` Felipe Balbi
2016-06-20 7:28 ` Roger Quadros
2016-06-20 8:13 ` Felipe Balbi
2016-06-20 8:25 ` Roger Quadros
2016-06-20 9:24 ` Felipe Balbi
2016-06-20 9:43 ` Roger Quadros
2016-06-10 13:07 ` [PATCH v10 07/14] usb: otg: get rid of CONFIG_USB_OTG_FSM in favour of CONFIG_USB_OTG Roger Quadros
2016-06-10 13:07 ` [PATCH v10 08/14] usb: otg: add OTG/dual-role core Roger Quadros
2016-06-12 11:21 ` Peter Chen
2016-06-13 7:42 ` Roger Quadros
2016-06-13 7:56 ` [PATCH v11 " Roger Quadros
2016-06-13 7:58 ` Peter Chen
2016-06-20 7:45 ` Felipe Balbi
2016-06-20 10:13 ` Roger Quadros
2016-06-20 12:03 ` Felipe Balbi
2016-06-20 12:26 ` Roger Quadros
2016-06-20 12:46 ` Felipe Balbi
2016-06-21 6:39 ` Peter Chen
2016-06-21 7:19 ` Felipe Balbi
2016-06-21 8:02 ` Peter Chen
2016-06-21 8:18 ` Felipe Balbi
2016-06-21 9:14 ` Peter Chen
2016-06-21 12:35 ` Felipe Balbi
2016-06-21 13:12 ` Peter Chen
2016-06-21 14:47 ` Felipe Balbi
2016-06-22 3:33 ` Peter Chen
2016-06-22 6:51 ` Felipe Balbi
2016-06-22 7:30 ` Peter Chen
2016-06-22 8:00 ` Felipe Balbi
2016-06-23 7:41 ` Yoshihiro Shimoda
2016-06-21 2:30 ` Yoshihiro Shimoda
2016-06-21 7:21 ` Felipe Balbi
2016-06-20 11:49 ` Peter Chen
2016-06-20 12:08 ` Felipe Balbi
2016-06-21 6:05 ` Peter Chen
2016-06-21 7:26 ` Felipe Balbi
2016-06-21 9:07 ` Peter Chen
2016-06-21 10:02 ` Felipe Balbi
2016-06-21 10:43 ` Tony Lindgren
2016-06-21 10:56 ` Felipe Balbi
2016-06-21 13:05 ` Peter Chen
2016-06-22 6:56 ` Felipe Balbi
2016-06-22 7:33 ` Peter Chen
2016-06-22 8:03 ` Felipe Balbi
2016-06-22 7:49 ` Roger Quadros
2016-06-22 8:14 ` Felipe Balbi
2016-06-22 8:30 ` Roger Quadros
2017-01-19 11:56 ` Vivek Gautam
2017-01-19 12:15 ` Roger Quadros
2017-01-19 15:15 ` vivek.gautam
2017-01-20 8:30 ` Roger Quadros
2017-01-20 11:39 ` Vivek Gautam
2016-06-23 7:42 ` Yoshihiro Shimoda
2016-06-10 13:07 ` [PATCH v10 09/14] usb: of: add an API to get OTG device from USB controller node Roger Quadros
2016-06-13 8:13 ` Jun Li
2016-06-13 8:16 ` Roger Quadros
2016-06-13 8:23 ` [PATCH v11 " Roger Quadros
2016-06-10 13:07 ` [PATCH v10 10/14] usb: otg: add hcd companion support Roger Quadros
2016-06-10 13:07 ` [PATCH v10 11/14] usb: otg: use dev_vdbg() instead of VDBG() Roger Quadros
2016-06-10 13:07 ` [PATCH v10 12/14] usb: hcd: Adapt to OTG core Roger Quadros
2016-06-14 8:17 ` Roger Quadros
2016-06-10 13:07 ` [PATCH v10 13/14] usb: gadget: udc: adapt " Roger Quadros
2016-06-12 11:36 ` Peter Chen
2016-06-13 7:14 ` Roger Quadros
2016-06-13 7:20 ` Peter Chen
2016-06-13 7:37 ` Roger Quadros
2016-06-13 7:40 ` Peter Chen
2016-06-13 7:55 ` [PATCH v11 " Roger Quadros
2016-06-13 7:56 ` Peter Chen
2016-06-13 8:06 ` Roger Quadros
2016-06-10 13:07 ` Roger Quadros [this message]
2016-06-14 8:18 ` [PATCH v10 14/14] usb: host: xhci-plat: Add otg device to platform data Roger Quadros
2016-06-14 2:17 ` [PATCH v10 00/14] USB OTG/dual-role framework Peter Chen
2016-06-14 8:12 ` Roger Quadros
2016-06-16 11:07 ` Roger Quadros
2016-06-17 7:17 ` Felipe Balbi
2016-06-17 7:31 ` 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=1465564043-27163-15-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=joe@perches.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 \
/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).