diff options
Diffstat (limited to 'arch/arm/mach-pxa/pxa3xx.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa3xx.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index e47e67c11afe..7cd9ef8deb02 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
| @@ -266,8 +266,6 @@ static void pxa3xx_cpu_standby(unsigned int pwrmode) | |||
| 266 | 266 | ||
| 267 | AD2D0ER = 0; | 267 | AD2D0ER = 0; |
| 268 | AD2D1ER = 0; | 268 | AD2D1ER = 0; |
| 269 | |||
| 270 | printk("PM: AD2D0SR=%08x ASCR=%08x\n", AD2D0SR, ASCR); | ||
| 271 | } | 269 | } |
| 272 | 270 | ||
| 273 | /* | 271 | /* |
| @@ -515,6 +513,14 @@ static int __init pxa3xx_init(void) | |||
| 515 | int i, ret = 0; | 513 | int i, ret = 0; |
| 516 | 514 | ||
| 517 | if (cpu_is_pxa3xx()) { | 515 | if (cpu_is_pxa3xx()) { |
| 516 | /* | ||
| 517 | * clear RDH bit every time after reset | ||
| 518 | * | ||
| 519 | * Note: the last 3 bits DxS are write-1-to-clear so carefully | ||
| 520 | * preserve them here in case they will be referenced later | ||
| 521 | */ | ||
| 522 | ASCR &= ~(ASCR_RDH | ASCR_D1S | ASCR_D2S | ASCR_D3S); | ||
| 523 | |||
| 518 | clks_register(pxa3xx_clks, ARRAY_SIZE(pxa3xx_clks)); | 524 | clks_register(pxa3xx_clks, ARRAY_SIZE(pxa3xx_clks)); |
| 519 | 525 | ||
| 520 | if ((ret = pxa_init_dma(32))) | 526 | if ((ret = pxa_init_dma(32))) |
