diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2015-01-14 21:04:41 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-01-29 10:24:52 -0500 |
| commit | 1ff990c01829adc24b3f88c07ec66a7c258a93e7 (patch) | |
| tree | 1e31123c6a8bfb26a8c57ce13facc0efcda36152 | |
| parent | 364e386917c8cdfadc5abd5a9b2c5cbac1c2133e (diff) | |
ARM: 8283/1: sa1100: collie: clear PWER register on machine init
Let kernel drivers to control wakeup sources instead of hardcoding them
in the collie.c board file.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-sa1100/collie.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index b90c7d828391..bd5155d04519 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c | |||
| @@ -371,8 +371,7 @@ static void __init collie_init(void) | |||
| 371 | PPC_LDD6 | PPC_LDD7 | PPC_L_PCLK | PPC_L_LCLK | PPC_L_FCLK | PPC_L_BIAS | | 371 | PPC_LDD6 | PPC_LDD7 | PPC_L_PCLK | PPC_L_LCLK | PPC_L_FCLK | PPC_L_BIAS | |
| 372 | PPC_TXD1 | PPC_TXD2 | PPC_TXD3 | PPC_TXD4 | PPC_SCLK | PPC_SFRM; | 372 | PPC_TXD1 | PPC_TXD2 | PPC_TXD3 | PPC_TXD4 | PPC_SCLK | PPC_SFRM; |
| 373 | 373 | ||
| 374 | PWER = _COLLIE_GPIO_AC_IN | _COLLIE_GPIO_CO | _COLLIE_GPIO_ON_KEY | | 374 | PWER = 0; |
| 375 | _COLLIE_GPIO_WAKEUP | _COLLIE_GPIO_nREMOCON_INT | PWER_RTC; | ||
| 376 | 375 | ||
| 377 | PGSR = _COLLIE_GPIO_nREMOCON_ON; | 376 | PGSR = _COLLIE_GPIO_nREMOCON_ON; |
| 378 | 377 | ||