Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e5f82dd authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[ARM] 4421/1: AT91: Value of _KEY fields. 



Use the actual value (0xA5) for the AT91_SHDW_KEY and AT91_WDT_KEY
register fields instead of a bitmask.

This is consistent with how AT91_RSTC_KEY is defined, and is easier to
use in code.

Signed-off-by: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f72267c3

include/asm-arm/arch-at91/at91_shdwc.h

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
#define AT91_SHDWC_H



#define AT91_SHDW_CR		(AT91_SHDWC + 0x00)	/* Shut Down Control Register */

#define		AT91_SHDW_SHDW		(1    << 0)		/* Processor Reset */

#define		AT91_SHDW_KEY		(0xff << 24)		/* KEY Password */

#define		AT91_SHDW_SHDW		(1    << 0)		/* Shut Down command */

#define		AT91_SHDW_KEY		(0xa5 << 24)		/* KEY Password */



#define AT91_SHDW_MR		(AT91_SHDWC + 0x04)	/* Shut Down Mode Register */

#define		AT91_SHDW_WKMODE0	(3 << 0)		/* Wake-up 0 Mode Selection */

include/asm-arm/arch-at91/at91_wdt.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#define AT91_WDT_CR		(AT91_WDT + 0x00)	/* Watchdog Control Register */

#define		AT91_WDT_WDRSTT		(1    << 0)		/* Restart */

#define		AT91_WDT_KEY		(0xff << 24)		/* KEY Password */

#define		AT91_WDT_KEY		(0xa5 << 24)		/* KEY Password */



#define AT91_WDT_MR		(AT91_WDT + 0x04)	/* Watchdog Mode Register */

#define		AT91_WDT_WDV		(0xfff << 0)		/* Counter Value */