From: Roger Quadros <rogerq@ti.com>
To: <peter.chen@freescale.com>
Cc: <stern@rowland.harvard.edu>, <balbi@kernel.org>,
<gregkh@linuxfoundation.org>, <dan.j.williams@intel.com>,
<jun.li@freescale.com>, <mathias.nyman@linux.intel.com>,
<tony@atomide.com>, <Joao.Pinto@synopsys.com>,
<abrestic@chromium.org>, <yoshihiro.shimoda.uh@renesas.com>,
<linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-omap@vger.kernel.org>, <devicetree@vger.kernel.org>,
Roger Quadros <rogerq@ti.com>
Subject: [PATCH v7 14/14] usb: host: xhci-plat: Add otg device to platform data
Date: Mon, 2 May 2016 15:18:57 +0300 [thread overview]
Message-ID: <1462191537-10314-15-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1462191537-10314-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>
---
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 5c15e9b..84ebe18 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -230,11 +230,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;
@@ -242,7 +251,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);
@@ -260,16 +272,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-05-02 12:20 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-02 12:18 [PATCH v7 00/14] USB OTG/dual-role framework Roger Quadros
2016-05-02 12:18 ` [PATCH v7 01/14] usb: hcd: Initialize hcd->flags to 0 Roger Quadros
2016-05-06 9:05 ` Peter Chen
2016-05-02 12:18 ` [PATCH v7 02/14] usb: otg-fsm: Prevent build warning "VDBG" redefined Roger Quadros
2016-05-11 8:17 ` Peter Chen
2016-05-02 12:18 ` [PATCH v7 03/14] usb: hcd.h: Add OTG to HCD interface Roger Quadros
2016-05-06 9:41 ` Peter Chen
2016-05-09 9:45 ` Roger Quadros
2016-05-10 3:14 ` Peter Chen
2016-05-10 7:34 ` Roger Quadros
2016-05-10 8:03 ` Jun Li
2016-05-10 9:20 ` Roger Quadros
2016-05-11 6:19 ` Peter Chen
2016-05-10 8:12 ` Felipe Balbi
2016-05-10 9:12 ` Roger Quadros
2016-05-02 12:18 ` [PATCH v7 04/14] usb: otg-fsm: use usb_otg wherever possible Roger Quadros
2016-05-02 12:18 ` [PATCH v7 05/14] usb: otg-fsm: move host controller operations into usb_otg->hcd_ops Roger Quadros
2016-05-11 6:10 ` Peter Chen
2016-05-11 11:02 ` Roger Quadros
2016-05-11 12:32 ` Roger Quadros
2016-05-12 8:18 ` Peter Chen
2016-05-12 8:29 ` Roger Quadros
2016-05-02 12:18 ` [PATCH v7 06/14] usb: gadget.h: Add OTG to gadget interface Roger Quadros
2016-05-02 12:18 ` [PATCH v7 07/14] usb: otg: get rid of CONFIG_USB_OTG_FSM in favour of CONFIG_USB_OTG Roger Quadros
2016-05-11 8:21 ` Peter Chen
2016-05-02 12:18 ` [PATCH v7 08/14] usb: otg: add OTG/dual-role core Roger Quadros
2016-05-11 8:34 ` Peter Chen
2016-05-11 11:03 ` Roger Quadros
2016-05-02 12:18 ` [PATCH v7 09/14] usb: of: add an API to get OTG device from USB controller node Roger Quadros
2016-05-04 13:15 ` Rob Herring
2016-05-11 8:40 ` Peter Chen
2016-05-11 11:04 ` Roger Quadros
2016-05-02 12:18 ` [PATCH v7 10/14] usb: otg: add hcd companion support Roger Quadros
2016-05-04 13:17 ` Rob Herring
2016-05-04 13:47 ` Roger Quadros
2016-05-11 13:54 ` Rob Herring
2016-05-11 14:13 ` Roger Quadros
2016-05-11 14:47 ` Alan Stern
2016-05-12 4:00 ` Yoshihiro Shimoda
2016-05-12 8:34 ` Roger Quadros
2016-05-12 9:31 ` Roger Quadros
2016-05-12 10:31 ` Yoshihiro Shimoda
2016-05-12 12:13 ` Roger Quadros
2016-05-16 2:13 ` Peter Chen
2016-05-16 8:01 ` Roger Quadros
2016-05-16 8:13 ` Peter Chen
2016-05-16 8:35 ` Roger Quadros
2016-05-12 18:16 ` Alan Stern
2016-05-11 8:43 ` Peter Chen
2016-05-02 12:18 ` [PATCH v7 11/14] usb: otg: use dev_dbg() instead of VDBG() Roger Quadros
2016-05-06 9:04 ` Peter Chen
2016-05-09 9:48 ` Roger Quadros
2016-05-11 8:43 ` Peter Chen
2016-05-02 12:18 ` [PATCH v7 12/14] usb: hcd: Adapt to OTG core Roger Quadros
2016-05-11 8:57 ` Peter Chen
2016-05-02 12:18 ` [PATCH v7 13/14] usb: gadget: udc: adapt " Roger Quadros
2016-05-02 12:18 ` Roger Quadros [this message]
2016-05-11 9:00 ` [PATCH v7 14/14] usb: host: xhci-plat: Add otg device to platform data Peter Chen
2016-05-11 8:36 ` [PATCH v7 00/14] USB OTG/dual-role framework Peter Chen
2016-05-11 11:05 ` 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=1462191537-10314-15-git-send-email-rogerq@ti.com \
--to=rogerq@ti.com \
--cc=Joao.Pinto@synopsys.com \
--cc=abrestic@chromium.org \
--cc=balbi@kernel.org \
--cc=dan.j.williams@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--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=peter.chen@freescale.com \
--cc=stern@rowland.harvard.edu \
--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
all inboxes | Powered by JetHome®