From 1c0a14ebb7beb5d1d8f9893aea95e42eded95c1c Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Mon, 17 Oct 2011 17:22:46 +0200 Subject: pxa: fix usb host register mismatch Signed-off-by: Stefan Herbrechtsmeier CC: Marek Vasut CC: Remy Bohmer --- arch/arm/cpu/pxa/usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/cpu/pxa/usb.c') diff --git a/arch/arm/cpu/pxa/usb.c b/arch/arm/cpu/pxa/usb.c index 83022e2e5..e95e0df5c 100644 --- a/arch/arm/cpu/pxa/usb.c +++ b/arch/arm/cpu/pxa/usb.c @@ -72,7 +72,7 @@ int usb_cpu_stop(void) udelay(11); writel(readl(UHCHR) & ~UHCHR_FHR, UHCHR); - writel(readl(UHCCOMS) | UHCHR_FHR, UHCCOMS); + writel(readl(UHCCOMS) | UHCCOMS_HCR, UHCCOMS); udelay(10); #if defined(CONFIG_CPU_MONAHANS) -- cgit v1.2.3-70-g09d2 From 66a181864d910afd7188ddbd747c70da96f7c505 Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Mon, 17 Oct 2011 17:22:47 +0200 Subject: pxa: activate the first usb host port on pxa27x by default The pxa27x has 3 usb host ports. Activate all by default. Signed-off-by: Stefan Herbrechtsmeier CC: Marek Vasut CC: Remy Bohmer --- arch/arm/cpu/pxa/usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/cpu/pxa/usb.c') diff --git a/arch/arm/cpu/pxa/usb.c b/arch/arm/cpu/pxa/usb.c index e95e0df5c..307fc6cee 100644 --- a/arch/arm/cpu/pxa/usb.c +++ b/arch/arm/cpu/pxa/usb.c @@ -55,7 +55,7 @@ int usb_cpu_init(void) while (readl(UHCHR) & UHCHR_FSBIR) udelay(1); -#if defined(CONFIG_CPU_MONAHANS) +#if defined(CONFIG_CPU_MONAHANS) || defined(CONFIG_PXA27X) writel(readl(UHCHR) & ~UHCHR_SSEP0, UHCHR); #endif #if defined(CONFIG_CPU_PXA27X) @@ -75,7 +75,7 @@ int usb_cpu_stop(void) writel(readl(UHCCOMS) | UHCCOMS_HCR, UHCCOMS); udelay(10); -#if defined(CONFIG_CPU_MONAHANS) +#if defined(CONFIG_CPU_MONAHANS) || defined(CONFIG_PXA27X) writel(readl(UHCHR) | UHCHR_SSEP0, UHCHR); #endif #if defined(CONFIG_CPU_PXA27X) -- cgit v1.2.3-70-g09d2