diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-10 21:53:51 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-10 21:53:51 +0200 |
| commit | 79d14faf5471b7fdc4244cb6299e94e8170d826e (patch) | |
| tree | e35eef45c8bf151e7de953602fb5b1b61793be0f /include | |
| parent | 3d71c81a9bb03f866a1e98da96363ef3f46c76b3 (diff) | |
| parent | 859f24350e6e4313626f85161dd03f025a4dac59 (diff) | |
| download | u-boot-imx-79d14faf5471b7fdc4244cb6299e94e8170d826e.zip u-boot-imx-79d14faf5471b7fdc4244cb6299e94e8170d826e.tar.gz u-boot-imx-79d14faf5471b7fdc4244cb6299e94e8170d826e.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/immap_86xx.h | 16 | ||||
| -rw-r--r-- | include/configs/MPC8610HPCD.h | 3 |
2 files changed, 17 insertions, 2 deletions
diff --git a/include/asm-ppc/immap_86xx.h b/include/asm-ppc/immap_86xx.h index c03b4b8..03a25c7 100644 --- a/include/asm-ppc/immap_86xx.h +++ b/include/asm-ppc/immap_86xx.h @@ -1304,9 +1304,21 @@ typedef struct ccsr_gur { uint lynxdcr1; /* 0xe0f08 - Lynx debug control register 1*/ int res14[6]; uint ddrioovcr; /* 0xe0f24 - DDR IO Overdrive Control register */ - char res15[61656]; + char res15[216]; } ccsr_gur_t; +/* + * Watchdog register block(0xe_4000-0xe_4fff) + */ +typedef struct ccsr_wdt { + uint res0; + uint swcrr; /* System watchdog control register */ + uint swcnr; /* System watchdog count register */ + char res1[2]; + ushort swsrr; /* System watchdog service register */ + char res2[4080]; +} ccsr_wdt_t; + typedef struct immap { ccsr_local_mcm_t im_local_mcm; ccsr_ddr_t im_ddr1; @@ -1330,6 +1342,8 @@ typedef struct immap { char res5[389120]; ccsr_rio_t im_rio; ccsr_gur_t im_gur; + char res6[12288]; + ccsr_wdt_t im_wdt; } immap_t; extern immap_t *immr; diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index fc16890..98ae34c 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -485,7 +485,8 @@ #endif -#undef CONFIG_WATCHDOG /* watchdog disabled */ +#define CONFIG_WATCHDOG /* watchdog enabled */ +#define CFG_WATCHDOG_FREQ 5000 /* Feed interval, 5s */ /*DIU Configuration*/ #define DIU_CONNECT_TO_DVI /* DIU controller connects to DVI encoder*/ |