[ARM] pxa/vpac270: fix now invalid bit of UP2OCR
authorMarek Vasut <marek.vasut@gmail.com>
Sun, 2 May 2010 04:10:25 +0000 (06:10 +0200)
committerEric Miao <eric.y.miao@gmail.com>
Tue, 11 May 2010 15:25:04 +0000 (17:25 +0200)
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>
arch/arm/mach-pxa/vpac270.c

index 46ad1b7..0954c24 100644 (file)
@@ -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 = {