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

Commit 410f4eae authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[ARM] 4085/1: AT91: Header fixes. 



Fix two typo's where AT01_* was used instead of AT91_*.
[Patch from Wojtek Kaniewski]

Fix definition of AT91_SMC_EXNWMODE for the SAM9 processors.
[Patch from Wu Xuan]

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

include/asm-arm/arch-at91rm9200/at91_rstc.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define		AT91_RSTC_PROCRST	(1 << 0)		/* Processor Reset */

#define		AT91_RSTC_PERRST	(1 << 2)		/* Peripheral Reset */

#define		AT91_RSTC_EXTRST	(1 << 3)		/* External Reset */

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

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



#define AT91_RSTC_SR		(AT91_RSTC + 0x04)	/* Reset Controller Status Register */

#define		AT91_RSTC_URSTS		(1 << 0)		/* User Reset Status */

include/asm-arm/arch-at91rm9200/at91sam9261_matrix.h

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


#define AT91_MATRIX_MCFG	(AT91_MATRIX + 0x00)	/* Master Configuration Register */

#define		AT91_MATRIX_RCB0	(1 << 0)		/* Remap Command for AHB Master 0 (ARM926EJ-S Instruction Master) */

#define		AT01_MATRIX_RCB1	(1 << 1)		/* Remap Command for AHB Master 1 (ARM926EJ-S Data Master) */

#define		AT91_MATRIX_RCB1	(1 << 1)		/* Remap Command for AHB Master 1 (ARM926EJ-S Data Master) */



#define AT91_MATRIX_SCFG0	(AT91_MATRIX + 0x04)	/* Slave Configuration Register 0 */

#define AT91_MATRIX_SCFG1	(AT91_MATRIX + 0x08)	/* Slave Configuration Register 1 */

include/asm-arm/arch-at91rm9200/at91sam926x_mc.h

+4 −4
Original line number Diff line number Diff line
@@ -110,10 +110,10 @@ 
#define AT91_SMC_MODE(n)	(AT91_SMC + 0x0c + ((n)*0x10))	/* Mode Register for CS n */

#define		AT91_SMC_READMODE	(1 <<  0)			/* Read Mode */

#define		AT91_SMC_WRITEMODE	(1 <<  1)			/* Write Mode */

#define		AT91_SMC_EXNWMODE	(3 <<  5)			/* NWAIT Mode */

#define			AT91_SMC_EXNWMODE_DISABLE	(0 << 5)

#define			AT91_SMC_EXNWMODE_FROZEN	(2 << 5)

#define			AT91_SMC_EXNWMODE_READY		(3 << 5)

#define		AT91_SMC_EXNWMODE	(3 <<  4)			/* NWAIT Mode */

#define			AT91_SMC_EXNWMODE_DISABLE	(0 << 4)

#define			AT91_SMC_EXNWMODE_FROZEN	(2 << 4)

#define			AT91_SMC_EXNWMODE_READY		(3 << 4)

#define		AT91_SMC_BAT		(1 <<  8)			/* Byte Access Type */

#define			AT91_SMC_BAT_SELECT		(0 << 8)

#define			AT91_SMC_BAT_WRITE		(1 << 8)