On Wed, Mar 26, 2014 at 01:19:51PM +0800, Peter Chen wrote: > On Wed, Mar 19, 2014 at 06:01:41PM +0800, Li Jun wrote: > > From: Li Jun <b47624@xxxxxxxxxxxxx> > > > > This patch adds sys input to control and show OTG fsm inputs by application, > > user can do host and preipheral role switch by change these inputs. > > > > Signed-off-by: Li Jun <b47624@xxxxxxxxxxxxx> > > --- > > drivers/usb/chipidea/otg.c | 1 + > > drivers/usb/chipidea/otg_fsm.c | 174 ++++++++++++++++++++++++++++++++++++++++ > > drivers/usb/chipidea/otg_fsm.h | 6 ++ > > 3 files changed, 181 insertions(+) > > > > diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c > > index 5098982..6de2f76 100644 > > --- a/drivers/usb/chipidea/otg.c > > +++ b/drivers/usb/chipidea/otg.c > > @@ -144,4 +144,5 @@ void ci_hdrc_otg_destroy(struct ci_hdrc *ci) > > /* Disable all OTG irq and clear status */ > > hw_write_otgsc(ci, OTGSC_INT_EN_BITS | OTGSC_INT_STATUS_BITS, > > OTGSC_INT_STATUS_BITS); > > + ci_hdrc_otg_fsm_remove(ci); > > } > > diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c > > index 569f208..fc0c6ce 100644 > > --- a/drivers/usb/chipidea/otg_fsm.c > > +++ b/drivers/usb/chipidea/otg_fsm.c > > @@ -41,6 +41,167 @@ static struct ci_otg_fsm_timer *otg_timer_initializer > > return timer; > > } > > > > +/* Add for otg: interact with user space app */ > > +static ssize_t > > +get_a_bus_req(struct device *dev, struct device_attribute *attr, char *buf) > > +{ > > + char *next; > > + unsigned size, t; > > + struct ci_hdrc *ci = dev_get_drvdata(dev); > > + > > + next = buf; > > + size = PAGE_SIZE; > > + t = scnprintf(next, size, "%d\n", ci->fsm.a_bus_req); > > + size -= t; > > + next += t; > > + > > + return PAGE_SIZE - size; > > +} > > + > > +static ssize_t > > +set_a_bus_req(struct device *dev, struct device_attribute *attr, > > + const char *buf, size_t count) > > +{ > > + struct ci_hdrc *ci = dev_get_drvdata(dev); > > + > > + if (count > 2) > > + return -1; > > + > > + mutex_lock(&ci->fsm.lock); > > + if (buf[0] == '0') { > > + ci->fsm.a_bus_req = 0; > > + } else if (buf[0] == '1') { > > + /* If a_bus_drop is TRUE, a_bus_req can't be set */ > > + if (ci->fsm.a_bus_drop) { > > + mutex_unlock(&ci->fsm.lock); > > + return count; > > + } > > + ci->fsm.a_bus_req = 1; > > + } > > + > > + disable_irq_nosync(ci->irq); > > + queue_work(ci->wq, &ci->work); > > + mutex_unlock(&ci->fsm.lock); > > + > > + return count; > > +} > > +static DEVICE_ATTR(a_bus_req, S_IRUGO | S_IWUSR, get_a_bus_req, set_a_bus_req); > > + > > +static ssize_t > > +get_a_bus_drop(struct device *dev, struct device_attribute *attr, char *buf) > > +{ > > + char *next; > > + unsigned size, t; > > + struct ci_hdrc *ci = dev_get_drvdata(dev); > > + > > + next = buf; > > + size = PAGE_SIZE; > > + t = scnprintf(next, size, "%d\n", ci->fsm.a_bus_drop); > > + size -= t; > > + next += t; > > + > > + return PAGE_SIZE - size; > > +} > > + > > +static ssize_t > > +set_a_bus_drop(struct device *dev, struct device_attribute *attr, > > + const char *buf, size_t count) > > +{ > > + struct ci_hdrc *ci = dev_get_drvdata(dev); > > + > > + if (count > 2) > > + return -1; > > + > > + mutex_lock(&ci->fsm.lock); > > + if (buf[0] == '0') { > > + ci->fsm.a_bus_drop = 0; > > + } else if (buf[0] == '1') { > > + ci->fsm.a_bus_drop = 1; > > + ci->fsm.a_bus_req = 0; > > + } > > + > > + disable_irq_nosync(ci->irq); > > + queue_work(ci->wq, &ci->work); > > + mutex_unlock(&ci->fsm.lock); > > + > > + return count; > > +} > > +static DEVICE_ATTR(a_bus_drop, S_IRUGO | S_IWUSR, get_a_bus_drop, > > + set_a_bus_drop); > > + > > +static ssize_t > > +get_b_bus_req(struct device *dev, struct device_attribute *attr, char *buf) > > +{ > > + char *next; > > + unsigned size, t; > > + struct ci_hdrc *ci = dev_get_drvdata(dev); > > + > > + next = buf; > > + size = PAGE_SIZE; > > + t = scnprintf(next, size, "%d\n", ci->fsm.b_bus_req); > > + size -= t; > > + next += t; > > + > > + return PAGE_SIZE - size; > > +} > > + > > +static ssize_t > > +set_b_bus_req(struct device *dev, struct device_attribute *attr, > > + const char *buf, size_t count) > > +{ > > + struct ci_hdrc *ci = dev_get_drvdata(dev); > > + > > + if (count > 2) > > + return -1; > > + > > + mutex_lock(&ci->fsm.lock); > > + if (buf[0] == '0') > > + ci->fsm.b_bus_req = 0; > > + else if (buf[0] == '1') > > + ci->fsm.b_bus_req = 1; > > + > > + disable_irq_nosync(ci->irq); > > + queue_work(ci->wq, &ci->work); > > + mutex_unlock(&ci->fsm.lock); > > + > > + return count; > > +} > > +static DEVICE_ATTR(b_bus_req, S_IRUGO | S_IWUSR, get_b_bus_req, set_b_bus_req); > > + > > +static ssize_t > > +set_a_clr_err(struct device *dev, struct device_attribute *attr, > > + const char *buf, size_t count) > > +{ > > + struct ci_hdrc *ci = dev_get_drvdata(dev); > > + > > + if (count > 2) > > + return -1; > > + > > + mutex_lock(&ci->fsm.lock); > > + if (buf[0] == '1') > > + ci->fsm.a_clr_err = 1; > > + > > + disable_irq_nosync(ci->irq); > > + queue_work(ci->wq, &ci->work); > > + mutex_unlock(&ci->fsm.lock); > > + > > + return count; > > +} > > +static DEVICE_ATTR(a_clr_err, S_IWUSR, NULL, set_a_clr_err); > > + > > +static struct attribute *inputs_attrs[] = { > > + &dev_attr_a_bus_req.attr, > > + &dev_attr_a_bus_drop.attr, > > + &dev_attr_b_bus_req.attr, > > + &dev_attr_a_clr_err.attr, > > + NULL, > > +}; > > + > > +static struct attribute_group inputs_attr_group = { > > + .name = "inputs", > > + .attrs = inputs_attrs, > > +}; > > + > > /* > > * Add timer to active timer list > > */ > > @@ -662,6 +823,13 @@ int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci) > > return retval; > > } > > > > + retval = sysfs_create_group(&ci->dev->kobj, &inputs_attr_group); > > + if (retval < 0) { > > + dev_dbg(ci->dev, > > + "Can't register sysfs attr group: %d\n", retval); > > + return retval; > > + } > > + > > /* Enable A vbus valid irq */ > > hw_write_otgsc(ci, OTGSC_AVVIE, OTGSC_AVVIE); > > > > @@ -674,3 +842,9 @@ int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci) > > > > return 0; > > } > > + > > +void ci_hdrc_otg_fsm_remove(struct ci_hdrc *ci) > > +{ > > + if (ci->platdata->dr_mode == USB_DR_MODE_OTG) > > + sysfs_remove_group(&ci->dev->kobj, &inputs_attr_group); > > +} > > An inline function for otg > yes, again for here, also for other necessary place. > > diff --git a/drivers/usb/chipidea/otg_fsm.h b/drivers/usb/chipidea/otg_fsm.h > > index 8ce7356..94fc820 100644 > > --- a/drivers/usb/chipidea/otg_fsm.h > > +++ b/drivers/usb/chipidea/otg_fsm.h > > @@ -88,6 +88,7 @@ int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci); > > int ci_otg_fsm_work(struct ci_hdrc *ci); > > irqreturn_t ci_otg_fsm_irq(struct ci_hdrc *ci); > > void ci_hdrc_otg_fsm_start(struct ci_hdrc *ci); > > +void ci_hdrc_otg_fsm_remove(struct ci_hdrc *ci); > > > > #else > > > > @@ -111,6 +112,11 @@ static void ci_hdrc_otg_fsm_start(struct ci_hdrc *ci) > > > > } > > > > +static void ci_hdrc_otg_fsm_remove(struct ci_hdrc *ci) > > +{ > > + > > +} > > + > > #endif > > > > #endif /* __DRIVERS_USB_CHIPIDEA_OTG_FSM_H */ > > -- > > 1.7.9.5 > > > > > > -- > > Best Regards, > Peter Chen > -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html