Typo in subject
gadeget's -> gadget's
On Wed, 17 Jun 2015 19:40:15 +0800
Li Jun <jun.li@xxxxxxxxxxxxx> wrote:
> Set gadget's otg capabilities according to controller's capability and otg
> properties in device tree.
>
> Signed-off-by: Li Jun <jun.li@xxxxxxxxxxxxx>
> ---
> drivers/usb/chipidea/core.c | 8 ++++++++
> drivers/usb/chipidea/udc.c | 7 ++++++-
> include/linux/usb/chipidea.h | 1 +
> 3 files changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
> index 74fea4f..2abecbc 100644
> --- a/drivers/usb/chipidea/core.c
> +++ b/drivers/usb/chipidea/core.c
> @@ -588,6 +588,14 @@ static int ci_get_platdata(struct device *dev,
> of_usb_host_tpl_support(dev->of_node);
> }
>
> + if (platdata->dr_mode == USB_DR_MODE_OTG) {
> + /* We can support HNP and SRP */
> + platdata->ci_otg_caps.hnp_support = true;
> + platdata->ci_otg_caps.srp_support = true;
> + /* Update otg capabilities by DT properties */
> + of_usb_set_otg_caps(dev->of_node, &platdata->ci_otg_caps);
we're not tackling the legacy platform case.
i.e. when otg-rev is not present in DT.
one way could be that of_usb_set_otg_caps sets otg-rev to 0 if
it is not present in DT.
> + }
> +
> if (of_usb_get_maximum_speed(dev->of_node) == USB_SPEED_FULL)
> platdata->flags |= CI_HDRC_FORCE_FULLSPEED;
>
> diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
> index 764f668..858bd21 100644
> --- a/drivers/usb/chipidea/udc.c
> +++ b/drivers/usb/chipidea/udc.c
> @@ -1827,6 +1827,7 @@ static irqreturn_t udc_irq(struct ci_hdrc *ci)
> static int udc_start(struct ci_hdrc *ci)
> {
> struct device *dev = ci->dev;
> + struct usb_otg_caps *otg_caps = &ci->platdata->ci_otg_caps;
> int retval = 0;
>
> spin_lock_init(&ci->lock);
> @@ -1834,8 +1835,12 @@ static int udc_start(struct ci_hdrc *ci)
> ci->gadget.ops = &usb_gadget_ops;
> ci->gadget.speed = USB_SPEED_UNKNOWN;
> ci->gadget.max_speed = USB_SPEED_HIGH;
> - ci->gadget.is_otg = ci->is_otg ? 1 : 0;
> ci->gadget.name = ci->platdata->name;
> + ci->gadget.otg_caps = otg_caps;
> +
> + if (otg_caps->otg_rev && (otg_caps->hnp_support ||
> + otg_caps->srp_support || otg_caps->adp_support))
> + ci->gadget.is_otg = 1;
>
> INIT_LIST_HEAD(&ci->gadget.ep_list);
>
> diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
> index ab94f78..e10cefc 100644
> --- a/include/linux/usb/chipidea.h
> +++ b/include/linux/usb/chipidea.h
> @@ -34,6 +34,7 @@ struct ci_hdrc_platform_data {
> #define CI_HDRC_CONTROLLER_STOPPED_EVENT 1
> void (*notify_event) (struct ci_hdrc *ci, unsigned event);
> struct regulator *reg_vbus;
> + struct usb_otg_caps ci_otg_caps;
> bool tpl_support;
> };
>
> --
> 1.9.1
>
cheers,
-roger
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
