summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-11-27 23:25:02 -0600
committerKumar Gala <galak@kernel.crashing.org>2007-12-11 22:34:19 -0600
commitf59b55a5b8fcadaa99781ba48e7a38e956afa527 (patch)
tree6760b9b27fea80ab62af85758bfd18c902fa4760 /include
parent50c03c8cf494d91cdec39670d95337c743e16ec9 (diff)
downloadu-boot-imx-f59b55a5b8fcadaa99781ba48e7a38e956afa527.zip
u-boot-imx-f59b55a5b8fcadaa99781ba48e7a38e956afa527.tar.gz
u-boot-imx-f59b55a5b8fcadaa99781ba48e7a38e956afa527.tar.bz2
Stop using immap_t for guts offset on 85xx
In the future the offsets to various blocks may not be in same location. Move to using CFG_MPC85xx_GUTS_ADDR as the base of the guts registers instead of getting it via &immap->im_gur. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc/immap_85xx.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-ppc/immap_85xx.h b/include/asm-ppc/immap_85xx.h
index 496fc72..df53bd2 100644
--- a/include/asm-ppc/immap_85xx.h
+++ b/include/asm-ppc/immap_85xx.h
@@ -1617,6 +1617,9 @@ typedef struct ccsr_gur {
char res15[61648]; /* 0xe0f30 to 0xefffff */
} ccsr_gur_t;
+#define CFG_MPC85xx_GUTS_OFFSET (0xE0000)
+#define CFG_MPC85xx_GUTS_ADDR (CFG_IMMR + CFG_MPC85xx_GUTS_OFFSET)
+
#define PORDEVSR_PCI (0x00800000) /* PCI Mode */
typedef struct immap {
@@ -1634,8 +1637,6 @@ typedef struct immap {
ccsr_tsec_t im_tsec2;
ccsr_pic_t im_pic;
ccsr_cpm_t im_cpm;
- ccsr_rio_t im_rio;
- ccsr_gur_t im_gur;
} immap_t;
extern immap_t *immr;