diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
| commit | 6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch) | |
| tree | 0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /include/asm-sh/ide.h | |
| parent | ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff) | |
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine
status unknown.
Diffstat (limited to 'include/asm-sh/ide.h')
| -rw-r--r-- | include/asm-sh/ide.h | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/include/asm-sh/ide.h b/include/asm-sh/ide.h index cc30fac03..1112ea36c 100644 --- a/include/asm-sh/ide.h +++ b/include/asm-sh/ide.h @@ -17,7 +17,7 @@ #include <linux/config.h> #ifndef MAX_HWIFS -#define MAX_HWIFS 1 /* XXX: For my board -- gniibe */ +#define MAX_HWIFS 1 #endif #define ide__sti() __sti() @@ -25,8 +25,13 @@ static __inline__ int ide_default_irq(ide_ioreg_t base) { switch (base) { - case 0xba0001f0: return 14; - case 0xba000170: return 14; +#ifdef CONFIG_SH_HP600 + case 0x201f0: return 77; + case 0x20170: return 77; +#else + case 0x01f0: return 14; + case 0x0170: return 15; +#endif default: return 0; } @@ -35,10 +40,17 @@ static __inline__ int ide_default_irq(ide_ioreg_t base) static __inline__ ide_ioreg_t ide_default_io_base(int index) { switch (index) { +#ifdef CONFIG_SH_HP600 + case 0: + return 0x201f0; + case 1: + return 0x20170; +#else case 0: - return 0xba0001f0; + return 0x1f0; case 1: - return 0xba000170; + return 0x170; +#endif default: return 0; } |