mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Lucas Stach <l.stach@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/2] usb: imx: add support for setting power pin polarity on i.MX6/7
Date: Tue, 24 Nov 2020 09:36:57 +0100	[thread overview]
Message-ID: <20201124083657.GB14718@pengutronix.de> (raw)
In-Reply-To: <20201123152931.4480-1-l.stach@pengutronix.de>

On Mon, Nov 23, 2020 at 04:29:30PM +0100, Lucas Stach wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  drivers/usb/imx/imx-usb-misc.c | 5 +++++
>  1 file changed, 5 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/drivers/usb/imx/imx-usb-misc.c b/drivers/usb/imx/imx-usb-misc.c
> index 3a5ec236e532..b663d073aa88 100644
> --- a/drivers/usb/imx/imx-usb-misc.c
> +++ b/drivers/usb/imx/imx-usb-misc.c
> @@ -354,6 +354,7 @@ static __maybe_unused struct imx_usb_misc_data mx5_data = {
>  #define MX6_USB_CTRL(n)			((n) * 4)
>  #define MX6_USB_CTRL_OVER_CUR_DIS	(1 << 7)
>  #define MX6_USB_CTRL_OVER_CUR_ACT_HIGH	(1 << 8)
> +#define MX6_USB_CTRL_PWR_POLARITY	(1 << 9)
>  
>  static void mx6_hsic_pullup(unsigned long reg, int on)
>  {
> @@ -380,6 +381,8 @@ static __maybe_unused int mx6_initialize_usb_hw(void __iomem *base, int port,
>  		val = readl(base + MX6_USB_CTRL(port));
>  		if (flags & MXC_EHCI_DISABLE_OVERCURRENT)
>  			val |= MX6_USB_CTRL_OVER_CUR_DIS;
> +		if (flags & MXC_EHCI_PWR_PIN_ACTIVE_HIGH)
> +			val |= MX6_USB_CTRL_PWR_POLARITY;
>  		writel(val, base + MX6_USB_CTRL(port));
>  		break;
>  	case 2: /* HSIC port */
> @@ -454,6 +457,8 @@ static int usbmisc_imx7d_init(void __iomem *base, int port,
>  		else
>  			reg |= MX6_USB_CTRL_OVER_CUR_ACT_HIGH;
>  	}
> +	if (flags & MXC_EHCI_PWR_PIN_ACTIVE_HIGH)
> +		reg |= MX6_USB_CTRL_PWR_POLARITY;
>  	writel(reg, base);
>  
>  	reg = readl(base + MX7D_USBNC_USB_CTRL2);
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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

      parent reply	other threads:[~2020-11-24  8:37 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-23 15:29 Lucas Stach
2020-11-23 15:29 ` [PATCH 2/2] usb: imx: get power pin polarity from DT Lucas Stach
2020-11-24  8:36 ` Sascha Hauer [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=20201124083657.GB14718@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=l.stach@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