public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [Patch v2 1/2] Atmel : usb : add EHCI driver for Atmel SoC
Date: Tue, 26 Jun 2012 14:33:46 +0200	[thread overview]
Message-ID: <201206261433.46868.marex@denx.de> (raw)
In-Reply-To: <1340677288-8041-2-git-send-email-voice.shen@atmel.com>

Dear Bo Shen,

> Some Atmel SoC support USB EHCI, add the EHCI driver to support it.
> 
> To enable the USB EHCI, add the following configuration options into
> board relative configuration file and remove USB OHCI options.
> 
>     #define CONFIG_USB_EHCI
>     #define CONFIG_USB_EHCI_ATMEL
>     #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     2
> 
> Signed-off-by: Bo Shen <voice.shen@atmel.com>
> ---
> 
> Change since v1:
>   Add WATCHDOG_RESET to avoid infinite loop.
> 
> ---
>  drivers/usb/host/Makefile     |    1 +
>  drivers/usb/host/ehci-atmel.c |   68
> +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69
> insertions(+)
>  create mode 100644 drivers/usb/host/ehci-atmel.c
> 
> diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
> index 59c3e57..4547f37 100644
> --- a/drivers/usb/host/Makefile
> +++ b/drivers/usb/host/Makefile
> @@ -36,6 +36,7 @@ COBJS-$(CONFIG_USB_SL811HS) += sl811-hcd.o
>  # echi
>  COBJS-$(CONFIG_USB_EHCI) += ehci-hcd.o
>  COBJS-$(CONFIG_USB_EHCI_ARMADA100) += ehci-armada100.o utmi-armada100.o
> +COBJS-$(CONFIG_USB_EHCI_ATMEL) += ehci-atmel.o
>  ifdef CONFIG_MPC512X
>  COBJS-$(CONFIG_USB_EHCI_FSL) += ehci-mpc512x.o
>  else
> diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
> new file mode 100644
> index 0000000..21037fe
> --- /dev/null
> +++ b/drivers/usb/host/ehci-atmel.c
> @@ -0,0 +1,68 @@
> +/*
> + * (C) Copyright 2012
> + * Atmel Semiconductor <www.atmel.com>
> + * Written-by: Bo Shen <voice.shen@atmel.com>
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + * MA 02110-1301 USA
> + */
> +
> +#include <common.h>
> +#include <watchdog.h>
> +#include <usb.h>
> +#include <asm/io.h>
> +#include <asm/arch/hardware.h>
> +#include <asm/arch/at91_pmc.h>
> +#include <asm/arch/clk.h>
> +
> +#include "ehci.h"
> +#include "ehci-core.h"
> +
> +int ehci_hcd_init(void)
> +{
> +	at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
> +
> +	/* Enable UPLL  */

Two spaces after UPLL, remove one.

> +	writel(AT91_PMC_UPLLEN | AT91_PMC_BIASEN, &pmc->uckr);
> +	while ((readl(&pmc->sr) & AT91_PMC_LOCKU) != AT91_PMC_LOCKU)
> +		WATCHDOG_RESET();

Ok, this is an endless loop, can you add timeout?

> +
> +	/* Enable USB Host clock */
> +	writel(1 << ATMEL_ID_UHPHS, &pmc->pcer);
> +
> +	hccr = (struct ehci_hccr *)ATMEL_BASE_EHCI;
> +	hcor = (struct ehci_hcor *)((uint32_t)hccr +
> +			HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
> +
> +	return 0;
> +}
> +
> +int ehci_hcd_stop(void)
> +{
> +	at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
> +
> +	/* Disable USB Host Clock */
> +	writel(1 << ATMEL_ID_UHPHS, &pmc->pcdr);
> +
> +	/* Disable UPLL */
> +	writel(readl(&pmc->uckr) & (~AT91_PMC_UPLLEN), &pmc->uckr);

& ~XXXXXXX is enough, remove the () .

> +	while ((readl(&pmc->sr) & AT91_PMC_LOCKU) == AT91_PMC_LOCKU)
> +		WATCHDOG_RESET();

Ditto here

> +
> +	return 0;
> +}

Otherwise it's good :-) One more rework and I'll apply it to usb tree.

Best regards,
Marek Vasut

  reply	other threads:[~2012-06-26 12:33 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-26  2:21 [U-Boot] [Patch v2 0/2] Add EHCI driver for Atmel SoC Bo Shen
2012-06-26  2:21 ` [U-Boot] [Patch v2 1/2] Atmel : usb : add " Bo Shen
2012-06-26 12:33   ` Marek Vasut [this message]
2012-06-26  2:21 ` [U-Boot] [Patch v2 2/2] AT91: at91sam9m10g45ek : Enable EHCI instead OHCI Bo Shen
2012-06-27 14:01   ` Andreas Bießmann
2012-06-27 14:13     ` 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=201206261433.46868.marex@denx.de \
    --to=marex@denx.de \
    --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