public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 4/8] mips: ath79: Add support for ungating USB on ar933x and ar934x
Date: Fri, 6 May 2016 13:34:53 +0200	[thread overview]
Message-ID: <572C815D.30904@gmail.com> (raw)
In-Reply-To: <1462472097-6407-4-git-send-email-marex@denx.de>



Am 05.05.2016 um 20:14 schrieb Marek Vasut:
> Add code to ungate the USB controller on ar933x and ar934x .
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> Cc: Wills Wang <wills.wang@live.com>
> ---
>  arch/mips/mach-ath79/include/mach/ath79.h |  2 +
>  arch/mips/mach-ath79/reset.c              | 61 +++++++++++++++++++++++++++++++
>  2 files changed, 63 insertions(+)
> 

there are checkpatch.pl warnings:

warning: arch/mips/mach-ath79/reset.c,112: line over 80 characters

> diff --git a/arch/mips/mach-ath79/include/mach/ath79.h b/arch/mips/mach-ath79/include/mach/ath79.h
> index 90d80b8..682b6a2 100644
> --- a/arch/mips/mach-ath79/include/mach/ath79.h
> +++ b/arch/mips/mach-ath79/include/mach/ath79.h
> @@ -140,4 +140,6 @@ static inline int soc_is_qca956x(void)
>  	return soc_is_tp9343() || soc_is_qca9561();
>  }
>  
> +int ath79_usb_reset(void);
> +
>  #endif /* __ASM_MACH_ATH79_H */
> diff --git a/arch/mips/mach-ath79/reset.c b/arch/mips/mach-ath79/reset.c
> index ba38609..bf4bc3b 100644
> --- a/arch/mips/mach-ath79/reset.c
> +++ b/arch/mips/mach-ath79/reset.c
> @@ -5,6 +5,7 @@
>   */
>  
>  #include <common.h>
> +#include <asm/errno.h>
>  #include <asm/io.h>
>  #include <asm/addrspace.h>
>  #include <asm/types.h>
> @@ -69,3 +70,63 @@ u32 get_bootstrap(void)
>  
>  	return 0;
>  }
> +
> +static int usb_reset_ar933x(void __iomem *reset_regs)
> +{
> +	/* Ungate the USB block */
> +	setbits_be32(reset_regs + AR933X_RESET_REG_RESET_MODULE,
> +		     AR933X_RESET_USBSUS_OVERRIDE);
> +	mdelay(1);
> +	clrbits_be32(reset_regs + AR933X_RESET_REG_RESET_MODULE,
> +		     AR933X_RESET_USB_HOST);
> +	mdelay(1);
> +	clrbits_be32(reset_regs + AR933X_RESET_REG_RESET_MODULE,
> +		     AR933X_RESET_USB_PHY);
> +	mdelay(1);
> +
> +	return 0;
> +}
> +
> +static int usb_reset_ar934x(void __iomem *reset_regs)
> +{
> +	/* Ungate the USB block */
> +	setbits_be32(reset_regs + AR934X_RESET_REG_RESET_MODULE,
> +		     AR934X_RESET_USBSUS_OVERRIDE);
> +	mdelay(1);
> +	clrbits_be32(reset_regs + AR934X_RESET_REG_RESET_MODULE,
> +		     AR934X_RESET_USB_PHY);
> +	mdelay(1);
> +	clrbits_be32(reset_regs + AR934X_RESET_REG_RESET_MODULE,
> +		     AR934X_RESET_USB_PHY_ANALOG);
> +	mdelay(1);
> +	clrbits_be32(reset_regs + AR934X_RESET_REG_RESET_MODULE,
> +		     AR934X_RESET_USB_HOST);
> +	mdelay(1);
> +
> +	return 0;
> +}
> +
> +int ath79_usb_reset(void)
> +{
> +	void __iomem *usbc_regs = map_physmem(AR71XX_USB_CTRL_BASE,
> +					      AR71XX_USB_CTRL_SIZE, MAP_NOCACHE);
> +	void __iomem *reset_regs = map_physmem(AR71XX_RESET_BASE,
> +					       AR71XX_RESET_SIZE, MAP_NOCACHE);
> +
> +	if (!usbc_regs || !reset_regs)
> +		return -EINVAL;

those checks are not necessary

> +
> +	/*
> +	 * Turn on the Buff and Desc swap bits.
> +	 * NOTE: This write into an undocumented register in mandatory to
> +	 *       get the USB controller operational in BigEndian mode.
> +	 */
> +	writel(0xf0000, usbc_regs + AR71XX_USB_CTRL_REG_CONFIG);
> +
> +	if (soc_is_ar933x())
> +		return usb_reset_ar933x(reset_regs);
> +	if (soc_is_ar934x())
> +		return usb_reset_ar934x(reset_regs);
> +
> +	return -EINVAL;
> +}
> 

-- 
- Daniel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160506/2dbc0322/attachment.sig>

  reply	other threads:[~2016-05-06 11:34 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-05 18:14 [U-Boot] [PATCH 1/8] mips: ath79: Fix ar71xx_regs.h indent Marek Vasut
2016-05-05 18:14 ` [U-Boot] [PATCH 2/8] mips: ath79: Fix compiler warning on const assignment Marek Vasut
2016-05-05 18:14 ` [U-Boot] [PATCH 3/8] mips: ath79: dts: Add generic-ehci node Marek Vasut
2016-05-05 18:14 ` [U-Boot] [PATCH 4/8] mips: ath79: Add support for ungating USB on ar933x and ar934x Marek Vasut
2016-05-06 11:34   ` Daniel Schwierzeck [this message]
2016-05-06 16:59     ` Marek Vasut
2016-05-05 18:14 ` [U-Boot] [PATCH 5/8] mips: ath79: dts: Add ethernet MAC nodes Marek Vasut
2016-05-05 18:14 ` [U-Boot] [PATCH 6/8] mips: ath79: Add support for ungating ethernet on ar933x and ar934x Marek Vasut
2016-05-05 18:14 ` [U-Boot] [PATCH 7/8] mips: ath79: Add AR934x support Marek Vasut
2016-05-06 11:32   ` Daniel Schwierzeck
2016-05-06 17:12     ` Marek Vasut
2016-05-05 18:14 ` [U-Boot] [PATCH 8/8] mips: ath79: Add support for TPLink WDR4300 Marek Vasut

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=572C815D.30904@gmail.com \
    --to=daniel.schwierzeck@gmail.com \
    --cc=u-boot@lists.denx.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