diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/w83c553f.h | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/w83c553f.h')
| -rw-r--r-- | include/w83c553f.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/include/w83c553f.h b/include/w83c553f.h index 88ea9da..6a76f5a 100644 --- a/include/w83c553f.h +++ b/include/w83c553f.h @@ -73,30 +73,30 @@ /* * Interrupt controller */ -#define W83C553F_PIC1_ICW1 CFG_ISA_IO + 0x20 -#define W83C553F_PIC1_ICW2 CFG_ISA_IO + 0x21 -#define W83C553F_PIC1_ICW3 CFG_ISA_IO + 0x21 -#define W83C553F_PIC1_ICW4 CFG_ISA_IO + 0x21 -#define W83C553F_PIC1_OCW1 CFG_ISA_IO + 0x21 -#define W83C553F_PIC1_OCW2 CFG_ISA_IO + 0x20 -#define W83C553F_PIC1_OCW3 CFG_ISA_IO + 0x20 -#define W83C553F_PIC1_ELC CFG_ISA_IO + 0x4D0 -#define W83C553F_PIC2_ICW1 CFG_ISA_IO + 0xA0 -#define W83C553F_PIC2_ICW2 CFG_ISA_IO + 0xA1 -#define W83C553F_PIC2_ICW3 CFG_ISA_IO + 0xA1 -#define W83C553F_PIC2_ICW4 CFG_ISA_IO + 0xA1 -#define W83C553F_PIC2_OCW1 CFG_ISA_IO + 0xA1 -#define W83C553F_PIC2_OCW2 CFG_ISA_IO + 0xA0 -#define W83C553F_PIC2_OCW3 CFG_ISA_IO + 0xA0 -#define W83C553F_PIC2_ELC CFG_ISA_IO + 0x4D1 - -#define W83C553F_TMR1_CMOD CFG_ISA_IO + 0x43 +#define W83C553F_PIC1_ICW1 CONFIG_SYS_ISA_IO + 0x20 +#define W83C553F_PIC1_ICW2 CONFIG_SYS_ISA_IO + 0x21 +#define W83C553F_PIC1_ICW3 CONFIG_SYS_ISA_IO + 0x21 +#define W83C553F_PIC1_ICW4 CONFIG_SYS_ISA_IO + 0x21 +#define W83C553F_PIC1_OCW1 CONFIG_SYS_ISA_IO + 0x21 +#define W83C553F_PIC1_OCW2 CONFIG_SYS_ISA_IO + 0x20 +#define W83C553F_PIC1_OCW3 CONFIG_SYS_ISA_IO + 0x20 +#define W83C553F_PIC1_ELC CONFIG_SYS_ISA_IO + 0x4D0 +#define W83C553F_PIC2_ICW1 CONFIG_SYS_ISA_IO + 0xA0 +#define W83C553F_PIC2_ICW2 CONFIG_SYS_ISA_IO + 0xA1 +#define W83C553F_PIC2_ICW3 CONFIG_SYS_ISA_IO + 0xA1 +#define W83C553F_PIC2_ICW4 CONFIG_SYS_ISA_IO + 0xA1 +#define W83C553F_PIC2_OCW1 CONFIG_SYS_ISA_IO + 0xA1 +#define W83C553F_PIC2_OCW2 CONFIG_SYS_ISA_IO + 0xA0 +#define W83C553F_PIC2_OCW3 CONFIG_SYS_ISA_IO + 0xA0 +#define W83C553F_PIC2_ELC CONFIG_SYS_ISA_IO + 0x4D1 + +#define W83C553F_TMR1_CMOD CONFIG_SYS_ISA_IO + 0x43 /* * DMA controller */ -#define W83C553F_DMA1 CFG_ISA_IO + 0x000 /* channel 0 - 3 */ -#define W83C553F_DMA2 CFG_ISA_IO + 0x0C0 /* channel 4 - 7 */ +#define W83C553F_DMA1 CONFIG_SYS_ISA_IO + 0x000 /* channel 0 - 3 */ +#define W83C553F_DMA2 CONFIG_SYS_ISA_IO + 0x0C0 /* channel 4 - 7 */ /* command/status register bit definitions */ |