diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /include/w83c553f.h | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
| download | u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.zip u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.gz u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.bz2 | |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
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 */ |