Messages in this thread Patch in this message | | | Date | Sun, 7 Dec 2003 21:51:26 +0100 | From | Geert Uytterhoeven <> | Subject | [PATCH 136] Amiga Gayle E-Matrix 530 IDE |
| |
Amiga Gayle IDE: Add support for the IDE interface on the M-Tech E-Matrix 530 expansion card
--- linux-2.4.23/Documentation/Configure.help 2003-10-30 14:06:08.000000000 +0100 +++ linux-m68k-2.4.23/Documentation/Configure.help 2003-11-03 22:10:12.000000000 +0100 @@ -1485,12 +1485,15 @@ Amiga Gayle IDE interface support CONFIG_BLK_DEV_GAYLE - This is the IDE driver for the builtin IDE interface on some Amiga - models. It supports both the `A1200 style' (used in A600 and A1200) - and `A4000 style' (used in A4000 and A4000T) of the Gayle IDE - interface. Say Y if you have such an Amiga model and want to use IDE - devices (hard disks, CD-ROM drives, etc.) that are connected to the - builtin IDE interface. + This is the IDE driver for the Amiga Gayle IDE interface. It supports + both the `A1200 style' and `A4000 style' of the Gayle IDE interface, + This includes builtin IDE interfaces on some Amiga models (A600, + A1200, A4000, and A4000T), and IDE interfaces on the Zorro expansion + bus (M-Tech E-Matrix 530 expansion card). + Say Y if you have an Amiga with a Gayle IDE interface and want to use + IDE devices (hard disks, CD-ROM drives, etc.) that are connected to it. + Note that you also have to enable Zorro bus support if you want to + use Gayle IDE interfaces on the Zorro expansion bus. Falcon IDE interface support CONFIG_BLK_DEV_FALCON_IDE --- linux-2.4.23/drivers/ide/legacy/gayle.c 2003-05-09 11:02:33.000000000 +0200 +++ linux-m68k-2.4.23/drivers/ide/legacy/gayle.c 2003-11-02 13:49:18.000000000 +0100 @@ -29,7 +29,7 @@ */ #define GAYLE_BASE_4000 0xdd2020 /* A4000/A4000T */ -#define GAYLE_BASE_1200 0xda0000 /* A1200/A600 */ +#define GAYLE_BASE_1200 0xda0000 /* A1200/A600 and E-Matrix 530 */ /* * Offsets from one of the above bases @@ -118,9 +118,17 @@ if (!MACH_IS_AMIGA) return; - if (!(a4000 = AMIGAHW_PRESENT(A4000_IDE)) && !AMIGAHW_PRESENT(A1200_IDE)) - return; + if ((a4000 = AMIGAHW_PRESENT(A4000_IDE)) || AMIGAHW_PRESENT(A1200_IDE)) + goto found; + +#ifdef CONFIG_ZORRO + if (zorro_find_device(ZORRO_PROD_MTEC_VIPER_MK_V_E_MATRIX_530_SCSI_IDE, + NULL)) + goto found; +#endif + return; +found: for (i = 0; i < GAYLE_NUM_PROBE_HWIFS; i++) { ide_ioreg_t base, ctrlport, irqport; ide_ack_intr_t *ack_intr; Gr{oetje,eeting}s, Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |