diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-07-14 22:05:31 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-07-14 22:05:31 +0200 |
| commit | e1e3cf7c79d97e7c59f90036d6e1e8e9d3abfbbe (patch) | |
| tree | a8401d3287fd63aae1c179fcd0bad9f919ee67ee /arch/powerpc/include/asm/immap_83xx.h | |
| parent | 50298d37e698a6c730eacf1811da5e7011e20113 (diff) | |
| parent | 4e43b2e861b981560b19c037c801b56c87575351 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'arch/powerpc/include/asm/immap_83xx.h')
| -rw-r--r-- | arch/powerpc/include/asm/immap_83xx.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h index 6b42a73f3f..3a9cdc4f8d 100644 --- a/arch/powerpc/include/asm/immap_83xx.h +++ b/arch/powerpc/include/asm/immap_83xx.h @@ -73,7 +73,11 @@ typedef struct sysconf83xx { u32 obir; /* Output Buffer Impedance Register */ u8 res8[0xC]; u32 pecr1; /* PCI Express control register 1 */ +#ifdef CONFIG_MPC8308 + u32 sdhccr; /* eSDHC Control Registers for MPC8308 */ +#else u32 pecr2; /* PCI Express control register 2 */ +#endif u8 res9[0xB8]; } sysconf83xx_t; @@ -589,7 +593,14 @@ typedef struct sdhc83xx { * SerDes */ typedef struct serdes83xx { - u8 fixme[0x100]; + u32 srdscr0; + u32 srdscr1; + u32 srdscr2; + u32 srdscr3; + u32 srdscr4; + u8 res0[0xc]; + u32 srdsrstctl; + u8 res1[0xdc]; } serdes83xx_t; /* @@ -691,7 +702,7 @@ typedef struct immap { u8 res7[0xC0000]; } immap_t; -#elif defined(CONFIG_MPC8315) +#elif defined(CONFIG_MPC8308) || defined(CONFIG_MPC8315) typedef struct immap { sysconf83xx_t sysconf; /* System configuration */ wdt83xx_t wdt; /* Watch Dog Timer (WDT) Registers */ |