mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
To: Steffen Trumtrar <s.trumtrar@pengutronix.de>,
	barebox@lists.infradead.org
Subject: Re: [PATCH] usb: chipidea: imx: add vbus regulator support
Date: Mon, 30 Jun 2014 09:57:48 +0200	[thread overview]
Message-ID: <53B1187C.3030401@gmail.com> (raw)
In-Reply-To: <1404114746-7020-1-git-send-email-s.trumtrar@pengutronix.de>

On 06/30/2014 09:52 AM, Steffen Trumtrar wrote:
> The chipidea binding describes the optional property of a regulator
> for vbus named "vbus-supply".
> 
> Add support for this property to the driver so it can be used on boards
> with a gpio-controlled regulator.
> 
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
>  drivers/usb/imx/chipidea-imx.c | 15 ++++++++++++++-
>  1 file changed, 14 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/imx/chipidea-imx.c b/drivers/usb/imx/chipidea-imx.c
> index 9b6829b..84522dc 100644
> --- a/drivers/usb/imx/chipidea-imx.c
> +++ b/drivers/usb/imx/chipidea-imx.c
> @@ -18,6 +18,7 @@
>  #include <of.h>
>  #include <errno.h>
>  #include <driver.h>
> +#include <regulator.h>
>  #include <usb/usb.h>
>  #include <usb/ehci.h>
>  #include <usb/chipidea-imx.h>
> @@ -32,6 +33,7 @@ struct imx_chipidea {
>  	struct ehci_data data;
>  	unsigned long flags;
>  	enum imx_usb_mode mode;
> +	struct regulator *reg_vbus;
>  	int portno;
>  	enum usb_phy_interface phymode;
>  };
> @@ -41,6 +43,12 @@ static int imx_chipidea_port_init(void *drvdata)
>  	struct imx_chipidea *ci = drvdata;
>  	int ret;
>  
> +	if (ci->reg_vbus) {
> +		ret = regulator_enable(ci->reg_vbus);
> +		if (ret < 0)
> +			return ret;
> +	}

Isn't barebox's regulator support using the dummy regulator, too?
A NULL regulator is interpreted as dummy regulator and can be used
with regulator API without checking each time.

>  	if ((ci->flags & MXC_EHCI_PORTSC_MASK) == MXC_EHCI_MODE_ULPI) {
>  		dev_dbg(ci->dev, "using ULPI phy\n");
>  		if (IS_ENABLED(CONFIG_USB_ULPI)) {
> @@ -54,8 +62,11 @@ static int imx_chipidea_port_init(void *drvdata)
>  			ret = -ENODEV;
>  		}
>  
> -		if (ret)
> +		if (ret) {
> +			if (ci->reg_vbus)
> +				regulator_disable(ci->reg_vbus);
>  			return ret;
> +		}
>  	}
>  
>  	ret = imx_usbmisc_port_init(ci->portno, ci->flags);
> @@ -126,6 +137,8 @@ static int imx_chipidea_probe_dt(struct imx_chipidea *ci)
>  				"disable-over-current", NULL))
>  		ci->flags |= MXC_EHCI_DISABLE_OVERCURRENT;
>  
> +	ci->reg_vbus = regulator_get(ci->dev, "vbus");
> +

Here, you should check for IS_ERR(ci->reg_vbus) and bail out if there is
an error. No property found should return NULL and therefore the dummy
regulator.

Sebastian

>  	return 0;
>  }
>  
> 


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      reply	other threads:[~2014-06-30  7:58 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-30  7:52 Steffen Trumtrar
2014-06-30  7:57 ` Sebastian Hesselbarth [this message]

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=53B1187C.3030401@gmail.com \
    --to=sebastian.hesselbarth@gmail.com \
    --cc=barebox@lists.infradead.org \
    --cc=s.trumtrar@pengutronix.de \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox