summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-24 15:28:05 +0200
committerWolfgang Denk <wd@denx.de>2008-04-24 15:28:05 +0200
commit0aa88c82667b9241107d7a0248c341db877e7e76 (patch)
treed2677d095d79df773451315c6ee2f134aec5c233 /include
parent876b8f978982216ab4a22dcd9efddfcd9b0e04e6 (diff)
parent0878af169b181868a105b5c33f3a6423e2c9fd60 (diff)
downloadu-boot-imx-0aa88c82667b9241107d7a0248c341db877e7e76.zip
u-boot-imx-0aa88c82667b9241107d7a0248c341db877e7e76.tar.gz
u-boot-imx-0aa88c82667b9241107d7a0248c341db877e7e76.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc/immap_85xx.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-ppc/immap_85xx.h b/include/asm-ppc/immap_85xx.h
index 01cb2d7..dc6e278 100644
--- a/include/asm-ppc/immap_85xx.h
+++ b/include/asm-ppc/immap_85xx.h
@@ -1570,7 +1570,9 @@ typedef struct ccsr_gur {
#define MPC85xx_PORDEVSR_RIO_CTLS 0x00000008
#define MPC85xx_PORDEVSR_RIO_DEV_ID 0x00000007
uint pordbgmsr; /* 0xe0010 - POR debug mode status register */
- char res1[12];
+ uint pordevsr2; /* 0xe0014 - POR I/O device status regsiter 2 */
+#define MPC85xx_PORDEVSR2_SEC_CFG 0x00000020
+ char res1[8];
uint gpporcr; /* 0xe0020 - General-purpose POR configuration register */
char res2[12];
uint gpiocr; /* 0xe0030 - GPIO control register */