Commit 79742351 authored by Li Jun's avatar Li Jun Committed by Felipe Balbi

usb: chipidea: set usb otg capabilities

Init and update otg capabilities by DT, set gadget's otg capabilities
accordingly.
Acked-by: default avatarPeter Chen <peter.chen@freescale.com>
Reviewed-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarLi Jun <jun.li@freescale.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 929412d9
...@@ -560,6 +560,8 @@ static irqreturn_t ci_irq(int irq, void *data) ...@@ -560,6 +560,8 @@ static irqreturn_t ci_irq(int irq, void *data)
static int ci_get_platdata(struct device *dev, static int ci_get_platdata(struct device *dev,
struct ci_hdrc_platform_data *platdata) struct ci_hdrc_platform_data *platdata)
{ {
int ret;
if (!platdata->phy_mode) if (!platdata->phy_mode)
platdata->phy_mode = of_usb_get_phy_mode(dev->of_node); platdata->phy_mode = of_usb_get_phy_mode(dev->of_node);
...@@ -588,6 +590,19 @@ static int ci_get_platdata(struct device *dev, ...@@ -588,6 +590,19 @@ static int ci_get_platdata(struct device *dev,
of_usb_host_tpl_support(dev->of_node); of_usb_host_tpl_support(dev->of_node);
} }
if (platdata->dr_mode == USB_DR_MODE_OTG) {
/* We can support HNP and SRP of OTG 2.0 */
platdata->ci_otg_caps.otg_rev = 0x0200;
platdata->ci_otg_caps.hnp_support = true;
platdata->ci_otg_caps.srp_support = true;
/* Update otg capabilities by DT properties */
ret = of_usb_update_otg_caps(dev->of_node,
&platdata->ci_otg_caps);
if (ret)
return ret;
}
if (of_usb_get_maximum_speed(dev->of_node) == USB_SPEED_FULL) if (of_usb_get_maximum_speed(dev->of_node) == USB_SPEED_FULL)
platdata->flags |= CI_HDRC_FORCE_FULLSPEED; platdata->flags |= CI_HDRC_FORCE_FULLSPEED;
......
...@@ -1827,6 +1827,7 @@ static irqreturn_t udc_irq(struct ci_hdrc *ci) ...@@ -1827,6 +1827,7 @@ static irqreturn_t udc_irq(struct ci_hdrc *ci)
static int udc_start(struct ci_hdrc *ci) static int udc_start(struct ci_hdrc *ci)
{ {
struct device *dev = ci->dev; struct device *dev = ci->dev;
struct usb_otg_caps *otg_caps = &ci->platdata->ci_otg_caps;
int retval = 0; int retval = 0;
spin_lock_init(&ci->lock); spin_lock_init(&ci->lock);
...@@ -1834,8 +1835,12 @@ static int udc_start(struct ci_hdrc *ci) ...@@ -1834,8 +1835,12 @@ static int udc_start(struct ci_hdrc *ci)
ci->gadget.ops = &usb_gadget_ops; ci->gadget.ops = &usb_gadget_ops;
ci->gadget.speed = USB_SPEED_UNKNOWN; ci->gadget.speed = USB_SPEED_UNKNOWN;
ci->gadget.max_speed = USB_SPEED_HIGH; ci->gadget.max_speed = USB_SPEED_HIGH;
ci->gadget.is_otg = ci->is_otg ? 1 : 0;
ci->gadget.name = ci->platdata->name; ci->gadget.name = ci->platdata->name;
ci->gadget.otg_caps = otg_caps;
if (otg_caps->hnp_support || otg_caps->srp_support ||
otg_caps->adp_support)
ci->gadget.is_otg = 1;
INIT_LIST_HEAD(&ci->gadget.ep_list); INIT_LIST_HEAD(&ci->gadget.ep_list);
......
...@@ -34,6 +34,7 @@ struct ci_hdrc_platform_data { ...@@ -34,6 +34,7 @@ struct ci_hdrc_platform_data {
#define CI_HDRC_CONTROLLER_STOPPED_EVENT 1 #define CI_HDRC_CONTROLLER_STOPPED_EVENT 1
void (*notify_event) (struct ci_hdrc *ci, unsigned event); void (*notify_event) (struct ci_hdrc *ci, unsigned event);
struct regulator *reg_vbus; struct regulator *reg_vbus;
struct usb_otg_caps ci_otg_caps;
bool tpl_support; bool tpl_support;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment