aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/vpac270.c
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2010-05-02 00:10:25 -0400
committerEric Miao <eric.y.miao@gmail.com>2010-05-11 11:25:04 -0400
commitfb25cb33096e2f86be5e45fecbc4d20eb66a9953 (patch)
tree0a7c531ad86304de354261b57d527cd1bafb3608 /arch/arm/mach-pxa/vpac270.c
parentbcc399bb491e0971d84aba593d79d3addf5d31ee (diff)
[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/vpac270.c')
-rw-r--r--arch/arm/mach-pxa/vpac270.c4
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 = {
359static void vpac270_udc_command(int cmd) 359static void vpac270_udc_command(int cmd)
360{ 360{
361 if (cmd == PXA2XX_UDC_CMD_CONNECT) 361 if (cmd == PXA2XX_UDC_CMD_CONNECT)
362 UP2OCR |= UP2OCR_HXOE | UP2OCR_DPPUE | UP2OCR_DPPUBE; 362 UP2OCR = UP2OCR_HXOE | UP2OCR_DPPUE;
363 else if (cmd == PXA2XX_UDC_CMD_DISCONNECT) 363 else if (cmd == PXA2XX_UDC_CMD_DISCONNECT)
364 UP2OCR &= ~(UP2OCR_HXOE | UP2OCR_DPPUE | UP2OCR_DPPUBE); 364 UP2OCR = UP2OCR_HXOE;
365} 365}
366 366
367static struct pxa2xx_udc_mach_info vpac270_udc_info __initdata = { 367static struct pxa2xx_udc_mach_info vpac270_udc_info __initdata = {