diff options
author | Marek Vasut <marek.vasut@gmail.com> | 2010-05-02 06:10:25 +0200 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2010-05-11 17:25:04 +0200 |
commit | fb25cb33096e2f86be5e45fecbc4d20eb66a9953 (patch) | |
tree | 0a7c531ad86304de354261b57d527cd1bafb3608 /arch/arm/mach-pxa | |
parent | bcc399bb491e0971d84aba593d79d3addf5d31ee (diff) | |
download | linux-stable-fb25cb33096e2f86be5e45fecbc4d20eb66a9953.tar.gz linux-stable-fb25cb33096e2f86be5e45fecbc4d20eb66a9953.tar.bz2 linux-stable-fb25cb33096e2f86be5e45fecbc4d20eb66a9953.zip |
[ARM] pxa/vpac270: fix now invalid bit of UP2OCR
This patch removes write to UP2OCR[DMSTATE] (ex-UP2OCR_DPPUBE) which is invalid
on PXA270C5 and later.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/vpac270.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c index 46ad1b7bde85..0954c2433a98 100644 --- a/arch/arm/mach-pxa/vpac270.c +++ b/arch/arm/mach-pxa/vpac270.c @@ -359,9 +359,9 @@ static struct platform_device vpac270_gpio_vbus = { static void vpac270_udc_command(int cmd) { if (cmd == PXA2XX_UDC_CMD_CONNECT) - UP2OCR |= UP2OCR_HXOE | UP2OCR_DPPUE | UP2OCR_DPPUBE; + UP2OCR = UP2OCR_HXOE | UP2OCR_DPPUE; else if (cmd == PXA2XX_UDC_CMD_DISCONNECT) - UP2OCR &= ~(UP2OCR_HXOE | UP2OCR_DPPUE | UP2OCR_DPPUBE); + UP2OCR = UP2OCR_HXOE; } static struct pxa2xx_udc_mach_info vpac270_udc_info __initdata = { |