Skip to content

Commit 1ff990c

Browse files
lumagRussell King
authored andcommitted
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 <[email protected]> Signed-off-by: Russell King <[email protected]>
1 parent 364e386 commit 1ff990c

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

arch/arm/mach-sa1100/collie.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,7 @@ static void __init collie_init(void)
371371
PPC_LDD6 | PPC_LDD7 | PPC_L_PCLK | PPC_L_LCLK | PPC_L_FCLK | PPC_L_BIAS |
372372
PPC_TXD1 | PPC_TXD2 | PPC_TXD3 | PPC_TXD4 | PPC_SCLK | PPC_SFRM;
373373

374-
PWER = _COLLIE_GPIO_AC_IN | _COLLIE_GPIO_CO | _COLLIE_GPIO_ON_KEY |
375-
_COLLIE_GPIO_WAKEUP | _COLLIE_GPIO_nREMOCON_INT | PWER_RTC;
374+
PWER = 0;
376375

377376
PGSR = _COLLIE_GPIO_nREMOCON_ON;
378377

0 commit comments

Comments
 (0)