Re: [PATCH v6 08/12] usb: hcd: Adapt to OTG core

From: Peter Chen
Date: Mon Apr 18 2016 - 02:37:06 EST


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 <rogerq@xxxxxx>
> ---
> 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 <linux/usb.h>
> #include <linux/usb/hcd.h>
> #include <linux/usb/phy.h>
> +#include <linux/usb/otg.h>
> +
> +#include <linux/of.h>
> +#include <linux/of_platform.h>
>
> #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

> + *
> + * 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.

> + 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);
> +

--

Best Regards,
Peter Chen