diff options
| author | Stefan Herbrechtsmeier <sherbrec@cit-ec.uni-bielefeld.de> | 2011-10-17 17:22:46 +0200 |
|---|---|---|
| committer | Remy Bohmer <linux@bohmer.net> | 2011-12-11 14:40:54 +0100 |
| commit | 1c0a14ebb7beb5d1d8f9893aea95e42eded95c1c (patch) | |
| tree | b6176365205f26d690e6a57723f1286fd19be62f | |
| parent | 0255f2d87c3e5c4a2f593746daa512024f56ce70 (diff) | |
| download | olio-uboot-2014.01-1c0a14ebb7beb5d1d8f9893aea95e42eded95c1c.tar.xz olio-uboot-2014.01-1c0a14ebb7beb5d1d8f9893aea95e42eded95c1c.zip | |
pxa: fix usb host register mismatch
Signed-off-by: Stefan Herbrechtsmeier <sherbrec@cit-ec.uni-bielefeld.de>
CC: Marek Vasut <marek.vasut@gmail.com>
CC: Remy Bohmer <linux@bohmer.net>
| -rw-r--r-- | arch/arm/cpu/pxa/usb.c | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-pxa/pxa-regs.h | 2 |
2 files changed, 3 insertions, 1 deletions
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) diff --git a/arch/arm/include/asm/arch-pxa/pxa-regs.h b/arch/arm/include/asm/arch-pxa/pxa-regs.h index 8527c68c8..0c3cd6dd2 100644 --- a/arch/arm/include/asm/arch-pxa/pxa-regs.h +++ b/arch/arm/include/asm/arch-pxa/pxa-regs.h @@ -835,6 +835,8 @@ typedef void (*ExcpHndlr) (void) ; #define UHCHIE 0x4C000068 #define UHCHIT 0x4C00006C +#define UHCCOMS_HCR (1<<0) + #define UHCHR_FSBIR (1<<0) #define UHCHR_FHR (1<<1) #define UHCHR_CGR (1<<2) |