Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754253AbcDTGrQ (ORCPT ); Wed, 20 Apr 2016 02:47:16 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:38228 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753346AbcDTGrO (ORCPT ); Wed, 20 Apr 2016 02:47:14 -0400 Subject: Re: [PATCH v6 08/12] usb: hcd: Adapt to OTG core To: Peter Chen References: <1459865117-7032-1-git-send-email-rogerq@ti.com> <1459865117-7032-9-git-send-email-rogerq@ti.com> <20160418062937.GA4477@shlinux2.ap.freescale.net> CC: , , , , , , , , , , , , , From: Roger Quadros Message-ID: <571725DE.3020402@ti.com> Date: Wed, 20 Apr 2016 09:46:54 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <20160418062937.GA4477@shlinux2.ap.freescale.net> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3104 Lines: 109 On 18/04/16 09:29, Peter Chen wrote: > On Tue, Apr 05, 2016 at 05:05:13PM +0300, Roger Quadros wrote: >> Introduce usb_otg_add/remove_hcd() for use by host >> controllers that are part of OTG/dual-role port. >> >> Non Device tree platforms can use the otg_dev argument >> to specify the OTG controller device. If otg_dev is NULL >> then the device tree node's otg-controller property is used to >> get the otg_dev device. >> >> Signed-off-by: Roger Quadros >> --- >> drivers/usb/core/hcd.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ >> include/linux/usb/hcd.h | 4 +++ >> 2 files changed, 75 insertions(+) >> >> diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c >> index 6b1930d..6a80193 100644 >> --- a/drivers/usb/core/hcd.c >> +++ b/drivers/usb/core/hcd.c >> @@ -46,6 +46,10 @@ >> #include >> #include >> #include >> +#include >> + >> +#include >> +#include >> >> #include "usb.h" >> >> @@ -3013,6 +3017,73 @@ void usb_remove_hcd(struct usb_hcd *hcd) >> } >> EXPORT_SYMBOL_GPL(usb_remove_hcd); >> >> + >> +static struct otg_hcd_ops otg_hcd_intf = { >> + .add = usb_add_hcd, >> + .remove = usb_remove_hcd, >> + .usb_bus_start_enum = usb_bus_start_enum, >> + .usb_control_msg = usb_control_msg, >> + .usb_hub_find_child = usb_hub_find_child, >> +}; >> + >> +/** >> + * usb_otg_add_hcd - Register the HCD with OTG core. >> + * @hcd: the usb_hcd structure to initialize >> + * @irqnum: Interrupt line to allocate >> + * @irqflags: Interrupt type flags >> + * @otg_dev: OTG controller device manging this HCD > > %s/manging/managing OK. > >> + * >> + * Registers the HCD with OTG core. OTG core will call usb_add_hcd() >> + * or usb_remove_hcd() as necessary. >> + * If otg_dev is NULL then device tree node is checked for OTG >> + * controller device via the otg-controller property. >> + */ >> +int usb_otg_add_hcd(struct usb_hcd *hcd, >> + unsigned int irqnum, unsigned long irqflags, >> + struct device *otg_dev) >> +{ > > Some users may not want to use default otg_hcd_ops, would you please > add one more parameter (eg, hcd_ops) for that? If hcd_ops is NULL, just > use the default one. > Can we please wait to add anything new till we have such users? >> + struct device *dev = hcd->self.controller; >> + >> + if (!otg_dev) { >> + struct device_node *np; >> + struct platform_device *pdev; >> + >> + np = of_parse_phandle(dev->of_node, "otg-controller", 0); >> + if (!np) { >> + dev_err(dev, >> + "otg_dev is NULL and no otg-controller property in DT\n"); >> + return -EINVAL; >> + } >> + >> + pdev = of_find_device_by_node(np); >> + of_node_put(np); >> + if (!pdev) { >> + dev_err(dev, >> + "couldn't get otg-controller device\n"); >> + return -ENODEV; >> + } >> + >> + hcd->otg_dev = &pdev->dev; >> + } else { >> + hcd->otg_dev = otg_dev; >> + } >> + >> + return usb_otg_register_hcd(hcd, irqnum, irqflags, &otg_hcd_intf); >> +} >> +EXPORT_SYMBOL_GPL(usb_otg_add_hcd); >> + > -- cheers, -roger