On Fri, Jul 25, 2014 at 08:33:28AM +0000, Peter Chen wrote:
>
> > > >
> > >
> > > Just add OTG member into ci_hdrc structure, see below patch
> > >
> > > diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
> > > index 9563cb5..186fb3f 100644
> > > --- a/drivers/usb/chipidea/ci.h
> > > +++ b/drivers/usb/chipidea/ci.h
> > > @@ -207,6 +207,7 @@ struct ci_hdrc {
> > > bool id_event;
> > > bool b_sess_valid_event;
> > > bool imx28_write_fix;
> > > + struct usb_otg otg;
> > > };
> > >
> > > static inline struct ci_role_driver *ci_role(struct ci_hdrc *ci) diff
> > > --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
> > > index a93d950..70d7fe2 100644
> > > --- a/drivers/usb/chipidea/host.c
> > > +++ b/drivers/usb/chipidea/host.c
> > > @@ -85,7 +85,7 @@ static int host_start(struct ci_hdrc *ci)
> > > if (ret) {
> > > goto disable_reg;
> > > } else {
> > > - struct usb_otg *otg = ci->transceiver->otg;
> > > + struct usb_otg *otg = &ci->otg;
> > >
> > > ci->hcd = hcd;
> > > if (otg) {
> > > diff --git a/drivers/usb/chipidea/otg_fsm.c
> > > b/drivers/usb/chipidea/otg_fsm.c index 8cb2508..fc8847e 100644
> > > --- a/drivers/usb/chipidea/otg_fsm.c
> > > +++ b/drivers/usb/chipidea/otg_fsm.c
> > > @@ -778,20 +778,8 @@ void ci_hdrc_otg_fsm_start(struct ci_hdrc *ci)
> > > int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci) {
> > > int retval = 0;
> > > - struct usb_otg *otg;
> > >
> > > - otg = devm_kzalloc(ci->dev,
> > > - sizeof(struct usb_otg), GFP_KERNEL);
> > > - if (!otg) {
> > > - dev_err(ci->dev,
> > > - "Failed to allocate usb_otg structure for ci hdrc
> > otg!\n");
> > > - return -ENOMEM;
> > > - }
> > > -
> > > - otg->phy = ci->transceiver;
> > > - otg->gadget = &ci->gadget;
> > > - ci->fsm.otg = otg;
> > > - ci->transceiver->otg = ci->fsm.otg;
> > > + ci->fsm.otg = &ci->otg;
> > > ci->fsm.power_up = 1;
> > > ci->fsm.id = hw_read_otgsc(ci, OTGSC_ID) ? 1 : 0;
> > > ci->fsm.otg->state = OTG_STATE_UNDEFINED; diff --git
> > > a/include/linux/usb/otg.h b/include/linux/usb/otg.h index
> > > 33d3480..b2f7587 100644
> > > --- a/include/linux/usb/otg.h
> > > +++ b/include/linux/usb/otg.h
> > > @@ -14,7 +14,6 @@
> > > struct usb_otg {
> > > u8 default_a;
> > >
> > > - struct usb_phy *phy;
> > > struct usb_bus *host;
> > > struct usb_gadget *gadget;
> > >
> > > diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index
> > > ac7d791..b732541 100644
> > > --- a/include/linux/usb/phy.h
> > > +++ b/include/linux/usb/phy.h
> > > @@ -79,8 +79,6 @@ struct usb_phy {
> > > enum usb_phy_type type;
> > > enum usb_phy_events last_event;
> > >
> > > - struct usb_otg *otg;
> > > -
> > > struct device *io_dev;
> > > struct usb_phy_io_ops *io_ops;
> > > void __iomem *io_priv;
> > > b29397@shlinux1:~/work/projects/upstream/usb/usb$ git diff > a.diff
> > > b29397@shlinux1:~/work/projects/upstream/usb/usb$ cat a.diff diff
> > > --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h index
> > > 9563cb5..186fb3f 100644
> > > --- a/drivers/usb/chipidea/ci.h
> > > +++ b/drivers/usb/chipidea/ci.h
> > > @@ -207,6 +207,7 @@ struct ci_hdrc {
> > > bool id_event;
> > > bool b_sess_valid_event;
> > > bool imx28_write_fix;
> > > + struct usb_otg otg;
> > > };
> > >
> > > static inline struct ci_role_driver *ci_role(struct ci_hdrc *ci) diff
> > > --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
> > > index a93d950..70d7fe2 100644
> > > --- a/drivers/usb/chipidea/host.c
> > > +++ b/drivers/usb/chipidea/host.c
> > > @@ -85,7 +85,7 @@ static int host_start(struct ci_hdrc *ci)
> > > if (ret) {
> > > goto disable_reg;
> > > } else {
> > > - struct usb_otg *otg = ci->transceiver->otg;
> > > + struct usb_otg *otg = &ci->otg;
> > >
> > > ci->hcd = hcd;
> > > if (otg) {
> > > diff --git a/drivers/usb/chipidea/otg_fsm.c
> > > b/drivers/usb/chipidea/otg_fsm.c index 8cb2508..fc8847e 100644
> > > --- a/drivers/usb/chipidea/otg_fsm.c
> > > +++ b/drivers/usb/chipidea/otg_fsm.c
> > > @@ -778,20 +778,8 @@ void ci_hdrc_otg_fsm_start(struct ci_hdrc *ci)
> > > int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci) {
> > > int retval = 0;
> > > - struct usb_otg *otg;
> > >
> > > - otg = devm_kzalloc(ci->dev,
> > > - sizeof(struct usb_otg), GFP_KERNEL);
> > > - if (!otg) {
> > > - dev_err(ci->dev,
> > > - "Failed to allocate usb_otg structure for ci hdrc otg!\n");
> > > - return -ENOMEM;
> > > - }
> > > -
> > > - otg->phy = ci->transceiver;
> > > - otg->gadget = &ci->gadget;
> > > - ci->fsm.otg = otg;
> > > - ci->transceiver->otg = ci->fsm.otg;
> > > + ci->fsm.otg = &ci->otg;
> > > ci->fsm.power_up = 1;
> > > ci->fsm.id = hw_read_otgsc(ci, OTGSC_ID) ? 1 : 0;
> > > ci->fsm.otg->state = OTG_STATE_UNDEFINED; diff --git
> > > a/include/linux/usb/otg.h b/include/linux/usb/otg.h index
> > > 33d3480..b2f7587 100644
> > > --- a/include/linux/usb/otg.h
> > > +++ b/include/linux/usb/otg.h
> > > @@ -14,7 +14,6 @@
> > > struct usb_otg {
> > > u8 default_a;
> > >
> > > - struct usb_phy *phy;
> > > struct usb_bus *host;
> > > struct usb_gadget *gadget;
> > >
> > > diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index
> > > ac7d791..b732541 100644
> > > --- a/include/linux/usb/phy.h
> > > +++ b/include/linux/usb/phy.h
> > > @@ -79,8 +79,6 @@ struct usb_phy {
> > > enum usb_phy_type type;
> > > enum usb_phy_events last_event;
> > >
> > > - struct usb_otg *otg;
> > > -
> > > struct device *io_dev;
> > > struct usb_phy_io_ops *io_ops;
> > > void __iomem *io_priv;
> >
> > Where does the ci->otg setup occurs? It seems to me it's never filled.
> >
>
> Currently, only two fields at struct usb_otg are needed for chipidea, they are:
> struct usb_bus *host;
> enum usb_otg_state state;
>
> They are initialized at:
> ci_hdrc_otg_fsm_init and host_start.
Ok, I get it. I'll update and add an OTG member into the ci_hdrc
structure.
Thanks!
Antoine
--
Antoine Ténart, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
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
