From: Peter Chen <peter.chen@freescale.com>
To: Antoine Tenart <antoine.tenart@free-electrons.com>
Cc: <balbi@ti.com>, <gregkh@linuxfoundation.org>, <kishon@ti.com>,
<stern@rowland.harvard.edu>, <sergei.shtylyov@cogentembedded.com>,
<yoshihiro.shimoda.uh@renesas.com>,
<alexandre.belloni@free-electrons.com>,
<thomas.petazzoni@free-electrons.com>, <zmxu@marvell.com>,
<jszhang@marvell.com>, <linux-usb@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v4 8/9] usb: chipidea: move usb_otg into struct ci_hdrc
Date: Thu, 11 Sep 2014 08:26:43 +0800 [thread overview]
Message-ID: <20140911002641.GB3609@peterchendt> (raw)
In-Reply-To: <1409730040-14200-9-git-send-email-antoine.tenart@free-electrons.com>
On Wed, Sep 03, 2014 at 09:40:39AM +0200, Antoine Tenart wrote:
> Move the usb_otg member from struct usb_phy to struct ci_hdrc. Rework
> its initialization taking in account this modification.
>
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
> ---
> drivers/usb/chipidea/ci.h | 1 +
> drivers/usb/chipidea/host.c | 5 +++--
> drivers/usb/chipidea/otg_fsm.c | 16 +++-------------
> 3 files changed, 7 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
> index b2caa1772712..dac5ab6adfa2 100644
> --- a/drivers/usb/chipidea/ci.h
> +++ b/drivers/usb/chipidea/ci.h
> @@ -177,6 +177,7 @@ struct ci_hdrc {
> struct ci_role_driver *roles[CI_ROLE_END];
> enum ci_role role;
> bool is_otg;
> + struct usb_otg otg;
> struct otg_fsm fsm;
> struct ci_otg_fsm_timer_list *fsm_timer;
> struct work_struct work;
> diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
> index 0b67d78dd953..4fcebb6a6d14 100644
> --- a/drivers/usb/chipidea/host.c
> +++ b/drivers/usb/chipidea/host.c
> @@ -85,10 +85,11 @@ static int host_start(struct ci_hdrc *ci)
> if (ret) {
> goto disable_reg;
> } else {
> - struct usb_otg *otg = ci->usb_phy->otg;
> + struct usb_otg *otg = &ci->otg;
>
> ci->hcd = hcd;
> - if (otg) {
> +
> + if (ci_otg_is_fsm_mode(ci)) {
> otg->host = &hcd->self;
> hcd->self.otg_port = 1;
> }
> diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c
> index 8a64ce87364e..862d7cb01b92 100644
> --- a/drivers/usb/chipidea/otg_fsm.c
> +++ b/drivers/usb/chipidea/otg_fsm.c
> @@ -778,20 +778,10 @@ 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->usb_phy = ci->usb_phy;
> - otg->gadget = &ci->gadget;
> - ci->fsm.otg = otg;
> - ci->usb_phy->otg = ci->fsm.otg;
> + ci->otg.usb_phy = ci->usb_phy;
> + ci->otg.gadget = &ci->gadget;
> + 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;
> --
Acked-by: Peter Chen <peter.chen@freescale.com>
--
Best Regards,
Peter Chen
next prev parent reply other threads:[~2014-09-11 1:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-03 7:40 [PATCH v4 0/9] usb: add support for the generic PHY framework Antoine Tenart
2014-09-03 7:40 ` [PATCH v4 1/9] usb: move the OTG state from the USB PHY to the OTG structure Antoine Tenart
2014-09-03 7:40 ` [PATCH v4 2/9] usb: rename phy to usb_phy in OTG Antoine Tenart
2014-09-03 7:40 ` [PATCH v4 3/9] usb: add support to the generic PHY framework " Antoine Tenart
2014-09-03 7:40 ` [PATCH v4 4/9] usb: rename phy to usb_phy in HCD Antoine Tenart
2014-09-03 21:44 ` Sergei Shtylyov
2014-09-03 22:06 ` Sergei Shtylyov
2014-09-03 7:40 ` [PATCH v4 5/9] usb: rename gen_phy to phy " Antoine Tenart
2014-09-03 7:40 ` [PATCH v4 6/9] usb: allow to supply the PHY in the drivers when using HCD Antoine Tenart
2014-09-03 7:40 ` [PATCH v4 7/9] usb: rename transceiver and phy to usb_phy in ChipIdea Antoine Tenart
2014-09-11 0:28 ` Peter Chen
2014-09-12 13:53 ` Antoine Tenart
2014-09-13 6:27 ` Peter Chen
2014-09-15 10:00 ` Antoine Tenart
2014-09-03 7:40 ` [PATCH v4 8/9] usb: chipidea: move usb_otg into struct ci_hdrc Antoine Tenart
2014-09-11 0:26 ` Peter Chen [this message]
2014-09-03 7:40 ` [PATCH v4 9/9] usb: chipidea: add support to the generic PHY framework in ChipIdea Antoine Tenart
2014-09-04 6:20 ` B47624
2014-09-11 0:54 ` Peter Chen
2014-09-11 15:42 ` Antoine Tenart
2014-09-12 1:10 ` Peter Chen
2014-09-12 8:21 ` Antoine Tenart
2014-09-12 9:27 ` Peter Chen
2014-09-12 9:35 ` Antoine Tenart
2014-09-12 10:28 ` Peter Chen
2014-09-12 12:03 ` Antoine Tenart
2014-09-13 0:59 ` Peter Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140911002641.GB3609@peterchendt \
--to=peter.chen@freescale.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=antoine.tenart@free-electrons.com \
--cc=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=jszhang@marvell.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=stern@rowland.harvard.edu \
--cc=thomas.petazzoni@free-electrons.com \
--cc=yoshihiro.shimoda.uh@renesas.com \
--cc=zmxu@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.