reverted:
--- linux-2.6.3-root/arch/i386/defconfig 2004-02-25 19:33:25.986009456 +0100
+++ linux-2.6.3/arch/i386/defconfig~atiixp_ide-2.6.3-orig 2004-02-25 19:33:25.964012800 +0100
@@ -278,7 +278,6 @@
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATIIXP is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
# CONFIG_BLK_DEV_CY82C693 is not set
diff -u linux-2.6.3-root/drivers/ide/Kconfig linux-2.6.3-root/drivers/ide/Kconfig
--- linux-2.6.3-root/drivers/ide/Kconfig 2004-02-25 19:33:25.987009304 +0100
+++ linux-2.6.3-root/drivers/ide/Kconfig 2004-02-25 18:39:40.116416176 +0100
@@ -562,8 +562,9 @@
config BLK_DEV_ATIIXP
tristate "ATI IXP chipset IDE support"
help
- This driver adds explicit support for ATI IXP chipset. This allows the kernel to
- change PIO, DMA and UDMA speeds and to configure the chip to optimum performance.
+ This driver adds explicit support for ATI IXP chipset.
+ This allows the kernel to change PIO, DMA and UDMA speeds
+ and to configure the chip to optimum performance.
Say Y here if you have an ATI IXP chipset IDE controller.
diff -u linux-2.6.3-root/drivers/ide/pci/atiixp.c linux-2.6.3-root/drivers/ide/pci/atiixp.c
--- linux-2.6.3-root/drivers/ide/pci/atiixp.c 2004-02-25 19:33:25.990008848 +0100
+++ linux-2.6.3-root/drivers/ide/pci/atiixp.c 2004-02-25 19:27:23.663090912 +0100
@@ -1,8 +1,9 @@
/*
- * linux/drivers/ide/pci/atiixp.c Version 0.01 Dec. 3, 2003
+ * linux/drivers/ide/pci/atiixp.c Version 0.01-bart1 Feb. 25, 2004
*
* Copyright (C) 2003 ATI Inc. <hyu@ati.com>
- *
+ * Copyright (C) 2004 Bartlomiej Zolnierkiewicz
+ *
*/
#include <linux/config.h>
@@ -18,21 +19,48 @@
#include <asm/io.h>
-/*#include "ide_modes.h"*/
-#include "atiixp.h"
+#define ATIIXP_IDE_PIO_TIMING 0x40
+#define ATIIXP_IDE_MDMA_TIMING 0x44
+#define ATIIXP_IDE_PIO_CONTROL 0x48
+#define ATIIXP_IDE_PIO_MODE 0x4a
+#define ATIIXP_IDE_UDMA_CONTROL 0x54
+#define ATIIXP_IDE_UDMA_MODE 0x56
+
+typedef struct {
+ u8 command_width;
+ u8 recover_width;
+} atiixp_ide_timing;
+
+static atiixp_ide_timing pio_timing[] = {
+ { 0x05, 0x0d },
+ { 0x04, 0x07 },
+ { 0x03, 0x04 },
+ { 0x02, 0x02 },
+ { 0x02, 0x00 },
+};
+
+static atiixp_ide_timing mdma_timing[] = {
+ { 0x07, 0x07 },
+ { 0x02, 0x01 },
+ { 0x02, 0x00 },
+};
+
+static int save_mdma_mode[4];
+
+#define DISPLAY_ATIIXP_TIMINGS
#if defined(DISPLAY_ATIIXP_TIMINGS) && defined(CONFIG_PROC_FS)
+
#include <linux/stat.h>
#include <linux/proc_fs.h>
-static u8 atiixp_proc = 0;
+static u8 atiixp_proc;
#define ATIIXP_MAX_DEVS 5
static struct pci_dev *atiixp_devs[ATIIXP_MAX_DEVS];
static int n_atiixp_devs;
-static int no_atiixp_dma = 0;
-static int save_mdma_mode[4];
+
/**
- * atiixp_get_info - fill in /proc for ATIIXP ide
+ * atiixp_get_info - fill in /proc for ATIIXP IDE
* @buffer: buffer to fill
* @addr: address of user start in buffer
* @offset: offset into 'file'
@@ -41,8 +69,8 @@
* Walks the ATIIXP devices and outputs summary data on the tuning and
* anything else that will help with debugging
*/
-
-static int atiixp_get_info (char *buffer, char **addr, off_t offset, int count)
+
+static int atiixp_get_info(char *buffer, char **addr, off_t offset, int count)
{
char *p = buffer;
int i;
@@ -50,29 +78,19 @@
for (i = 0; i < n_atiixp_devs; i++) {
struct pci_dev *dev = atiixp_devs[i];
unsigned long bibma = pci_resource_start(dev, 4);
- u16 udma_mode = 0, pio_mode = 0;
- u8 c0 = 0, c1 = 0, udma_control = 0, mdma_mode[4];
+ u16 udma_mode = 0, pio_mode = 0;
+ u8 c0 = 0, c1 = 0, udma_control = 0;
u32 mdma_timing;
p += sprintf(p, "\nController: %d\n", i);
p += sprintf(p, "\n ATI ");
- switch(dev->device) {
- case PCI_DEVICE_ID_ATI_IXP_IDE:
- p += sprintf(p, "ATIIXP Ultra100 IDE ");
- break;
- default:
- p += sprintf(p, "ATIIXP ");
- break;
- }
- p += sprintf(p, "Chipset.\n");
+ p += sprintf(p, "ATIIXP Ultra100 IDE Chipset.\n");
pci_read_config_byte(dev, ATIIXP_IDE_UDMA_CONTROL, &udma_control);
pci_read_config_word(dev, ATIIXP_IDE_UDMA_MODE, &udma_mode);
pci_read_config_word(dev, ATIIXP_IDE_PIO_MODE, &pio_mode);
pci_read_config_dword(dev, ATIIXP_IDE_MDMA_TIMING, &mdma_timing);
- for (i=0; i<4; i++) {
- if (mdma_mode[i] > 2) mdma_mode[i] = 2;
- }
+
/*
* at that point bibma+0x2 et bibma+0xa are byte registers
* to investigate:
@@ -103,38 +121,46 @@
(udma_control&0x08) ? "yes" : "no " );
p += sprintf(p, "UDMA mode: %c %c "
" %c %c\n",
- (udma_control&0x01) ?
+ (udma_control&0x01) ?
((udma_mode & 0x07) + 48):'X',
- (udma_control&0x02) ?
+ (udma_control&0x02) ?
(((udma_mode >> 4) & 0x07) + 48):'X',
- (udma_control&0x04) ?
+ (udma_control&0x04) ?
(((udma_mode >> 8) & 0x07) + 48):'X',
- (udma_control&0x08) ?
+ (udma_control&0x08) ?
(((udma_mode >> 12) & 0x07) + 48):'X');
p += sprintf(p, "MDMA mode: %c %c "
" %c %c\n",
- ((save_mdma_mode[0] != -1) && (c0&0x20)) ?
+ (save_mdma_mode[0] && (c0 & 0x20)) ?
((save_mdma_mode[0] & 0xf) + 48) : 'X',
- ((save_mdma_mode[1] != -1) && (c0&0x40)) ?
+ (save_mdma_mode[1] && (c0 & 0x40)) ?
((save_mdma_mode[1] & 0xf) + 48) : 'X',
- ((save_mdma_mode[2] != -1) && (c1&0x20)) ?
+ (save_mdma_mode[2] && (c1 & 0x20)) ?
((save_mdma_mode[2] & 0xf) + 48) : 'X',
- ((save_mdma_mode[3] != -1) && (c1&0x40)) ?
+ (save_mdma_mode[3] && (c1 & 0x40)) ?
((save_mdma_mode[3] & 0xf) + 48) : 'X');
p += sprintf(p, "PIO mode: %c %c "
" %c %c\n",
- (c0&0x20) ?
+ (c0&0x20) ?
'X':((pio_mode & 0x07) + 48),
- (c0&0x40) ?
+ (c0&0x40) ?
'X':(((pio_mode >> 4) & 0x07) + 48),
- (c1&0x20) ?
+ (c1&0x20) ?
'X':(((pio_mode >> 8) & 0x07) + 48),
- (c1&0x40) ?
+ (c1&0x40) ?
'X':(((pio_mode >> 12) & 0x07) + 48));
}
return p-buffer; /* => must be less than 4k! */
}
+
+static ide_pci_host_proc_t atiixp_procs[] = {
+ {
+ .name = "atiixp",
+ .set = 1,
+ .get_info = atiixp_get_info,
+ },
+};
#endif /* defined(DISPLAY_ATIIXP_TIMINGS) && defined(CONFIG_PROC_FS) */
/**
@@ -143,24 +169,11 @@
*
* Returns the available modes for the ATIIXP IDE controller.
*/
-
-static u8 atiixp_ratemask (ide_drive_t *drive)
+
+static u8 atiixp_ratemask(ide_drive_t *drive)
{
- struct pci_dev *dev = HWIF(drive)->pci_dev;
- u8 mode;
+ u8 mode = 3;
- switch(dev->device) {
- case PCI_DEVICE_ID_ATI_IXP_IDE:
- mode = 3;
- break;
- default:
- return 0;
- }
-
- /*
- * If we are UDMA66 capable fall back to UDMA33
- * if the drive cannot see an 80pin cable.
- */
if (!eighty_ninty_three(drive))
mode = min(mode, (u8)1);
return mode;
@@ -173,8 +186,8 @@
* Returns the nearest equivalent PIO timing for the PIO or DMA
* mode requested by the controller.
*/
-
-static u8 atiixp_dma_2_pio (u8 xfer_rate) {
+
+static u8 atiixp_dma_2_pio(u8 xfer_rate) {
switch(xfer_rate) {
case XFER_UDMA_6:
case XFER_UDMA_5:
@@ -203,52 +216,49 @@
}
}
-static int atiixp_ide_dma_host_on (ide_drive_t *drive)
+static int atiixp_ide_dma_host_on(ide_drive_t *drive)
{
ide_hwif_t *hwif = HWIF(drive);
struct pci_dev *dev = hwif->pci_dev;
int is_slave = (&hwif->drives[1] == drive);
- int control_shift = hwif->channel?2:0 + is_slave?1:0;
+ int control_shift = hwif->channel ? 2 : 0 + is_slave ? 1 : 0;
u16 tmp16;
- u32 flags;
+ unsigned long flags;
spin_lock_irqsave(&ide_lock, flags);
- if ((save_mdma_mode[control_shift] >= XFER_MW_DMA_0) &&
- (save_mdma_mode[control_shift] <= XFER_MW_DMA_2)) {
- pci_read_config_word(dev, ATIIXP_IDE_UDMA_CONTROL, &tmp16);
- tmp16 &= ~(1 << control_shift);
- pci_write_config_word(dev, ATIIXP_IDE_UDMA_CONTROL, tmp16);
- } else {
- pci_read_config_word(dev, ATIIXP_IDE_UDMA_CONTROL, &tmp16);
- tmp16 |= (1 << control_shift);
- pci_write_config_word(dev, ATIIXP_IDE_UDMA_CONTROL, tmp16);
- }
+ pci_read_config_word(dev, ATIIXP_IDE_UDMA_CONTROL, &tmp16);
+ if (save_mdma_mode[control_shift])
+ tmp16 &= ~(1 << control_shift);
+ else
+ tmp16 |= (1 << control_shift);
+ pci_write_config_word(dev, ATIIXP_IDE_UDMA_CONTROL, tmp16);
spin_unlock_irqrestore(&ide_lock, flags);
return __ide_dma_host_on(drive);
}
-static int atiixp_ide_dma_host_off (ide_drive_t *drive)
+static int atiixp_ide_dma_host_off(ide_drive_t *drive)
{
ide_hwif_t *hwif = HWIF(drive);
struct pci_dev *dev = hwif->pci_dev;
int is_slave = (&hwif->drives[1] == drive);
- int control_shift = hwif->channel?2:0 + is_slave?1:0;
+ int control_shift = hwif->channel ? 2 : 0 + is_slave ? 1 : 0;
u16 tmp16;
- u32 flags;
+ unsigned long flags;
spin_lock_irqsave(&ide_lock, flags);
pci_read_config_word(dev, ATIIXP_IDE_UDMA_CONTROL, &tmp16);
tmp16 &= ~(1 << control_shift);
pci_write_config_word(dev, ATIIXP_IDE_UDMA_CONTROL, tmp16);
-
+
spin_unlock_irqrestore(&ide_lock, flags);
return __ide_dma_host_off(drive);
}
+
/**
* atiixp_tune_drive - tune a drive attached to a ATIIXP
* @drive: drive to tune
@@ -257,21 +267,19 @@
* Set the interface PIO mode based upon the settings done by AMI BIOS
* (might be useful if drive is not registered in CMOS for any reason).
*/
-static void atiixp_tuneproc (ide_drive_t *drive, u8 pio)
+
+static void atiixp_tuneproc(ide_drive_t *drive, u8 pio)
{
ide_hwif_t *hwif = HWIF(drive);
struct pci_dev *dev = hwif->pci_dev;
int is_slave = (&hwif->drives[1] == drive);
- u32 flags;
+ unsigned long flags;
u16 pio_mode_data;
u32 pio_timing_data;
- int mode_shift = hwif->channel?8:0 + is_slave?4:0;
- int timing_shift = hwif->channel?16:0 + is_slave?0:8;
+ int mode_shift = hwif->channel ? 8 : 0 + is_slave ? 4 : 0;
+ int timing_shift = hwif->channel ? 16 : 0 + is_slave ? 0 : 8;
spin_lock_irqsave(&ide_lock, flags);
- if (pio >= XFER_MW_DMA_0) {
- pio = atiixp_dma_2_pio(pio);
- }
pci_read_config_word(dev, ATIIXP_IDE_PIO_MODE, &pio_mode_data);
pio_mode_data &= ~(0x07 << mode_shift);
@@ -296,23 +304,24 @@
* requires the right timing data into the ATIIXP configuration space
* then setting the drive parameters appropriately
*/
-
-static int atiixp_speedproc (ide_drive_t *drive, u8 xferspeed)
+
+static int atiixp_speedproc(ide_drive_t *drive, u8 xferspeed)
{
ide_hwif_t *hwif = HWIF(drive);
struct pci_dev *dev = hwif->pci_dev;
u8 speed = ide_rate_filter(atiixp_ratemask(drive), xferspeed);
int is_slave = (&hwif->drives[1] == drive);
- int control_shift = hwif->channel?2:0 + is_slave?1:0;
- int mode_shift = hwif->channel?8:0 + is_slave?4:0;
- int timing_shift = hwif->channel?16:0 + is_slave?0:8;
+ int control_shift = hwif->channel ? 2 : 0 + is_slave ? 1 : 0;
+ int mode_shift = hwif->channel ? 8 : 0 + is_slave ? 4 : 0;
+ int timing_shift = hwif->channel ? 16 : 0 + is_slave ? 0 : 8;
u16 tmp16;
u32 tmp32;
- u32 flags;
+ unsigned long flags;
+ u8 pio;
spin_lock_irqsave(&ide_lock, flags);
- save_mdma_mode[control_shift] = -1;
+ save_mdma_mode[control_shift] = 0;
if (speed >= XFER_UDMA_0) {
pci_read_config_word(dev, ATIIXP_IDE_UDMA_MODE, &tmp16);
tmp16 &= ~(0x07 << mode_shift);
@@ -320,7 +329,7 @@
pci_write_config_word(dev, ATIIXP_IDE_UDMA_MODE, tmp16);
} else {
if ((speed >= XFER_MW_DMA_0) && (speed <= XFER_MW_DMA_2)) {
- save_mdma_mode[control_shift] = speed;
+ save_mdma_mode[control_shift] = speed;
pci_read_config_dword(dev, ATIIXP_IDE_MDMA_TIMING, &tmp32);
tmp32 &= ~(0xff << timing_shift);
tmp32 |= (mdma_timing[speed & 0x03].recover_width << timing_shift) |
@@ -331,31 +340,33 @@
spin_unlock_irqrestore(&ide_lock, flags);
- atiixp_tuneproc(drive, speed);
+ if (speed >= XFER_SW_DMA_0)
+ pio = atiixp_dma_2_pio(speed);
+ else
+ pio = speed - XFER_PIO_0;
- return (ide_config_drive_speed(drive, speed));
-}
+ atiixp_tuneproc(drive, pio);
+ return ide_config_drive_speed(drive, speed);
+}
/**
* atiixp_config_drive_for_dma - configure drive for DMA
* @drive: IDE drive to configure
*
* Set up a ATIIXP interface channel for the best available speed.
- * We prefer UDMA if it is available and then MWDMA. If DMA is
- * not available we switch to PIO and return 0.
+ * We prefer UDMA if it is available and then MWDMA. If DMA is
+ * not available we switch to PIO and return 0.
*/
-
-static int atiixp_config_drive_for_dma (ide_drive_t *drive)
+
+static int atiixp_config_drive_for_dma(ide_drive_t *drive)
{
u8 speed = ide_dma_speed(drive, atiixp_ratemask(drive));
-
- /* If no DMA speed was available or the chipset has DMA bugs
- then disable DMA and use PIO */
-
- if (!speed || no_atiixp_dma) {
+
+ /* If no DMA speed was available then disable DMA and use PIO. */
+ if (!speed) {
u8 tspeed = ide_get_best_pio_mode(drive, 255, 5, NULL);
- speed = atiixp_dma_2_pio(XFER_PIO_0 + tspeed);
+ speed = atiixp_dma_2_pio(XFER_PIO_0 + tspeed) + XFER_PIO_0;
}
(void) atiixp_speedproc(drive, speed);
@@ -369,8 +380,8 @@
* Set up the ATIIXP interface for the best available speed on this
* interface, preferring DMA to PIO.
*/
-
-static int atiixp_dma_check (ide_drive_t *drive)
+
+static int atiixp_dma_check(ide_drive_t *drive)
{
ide_hwif_t *hwif = HWIF(drive);
struct hd_driveid *id = drive->id;
@@ -424,10 +435,9 @@
* Initialize the PCI device as required. For the ATIIXP this turns
* out to be nice and simple
*/
-
-static unsigned int __devinit init_chipset_atiixp (struct pci_dev *dev, const char *name)
-{
+static unsigned int __devinit init_chipset_atiixp(struct pci_dev *dev, const char *name)
+{
#if defined(DISPLAY_ATIIXP_TIMINGS) && defined(CONFIG_PROC_FS)
atiixp_devs[n_atiixp_devs++] = dev;
@@ -446,8 +456,8 @@
* Set up the ide_hwif_t for the ATIIXP interface according to the
* capabilities of the hardware.
*/
-
-static void __init init_hwif_atiixp (ide_hwif_t *hwif)
+
+static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
{
#ifndef CONFIG_IA64
if (!hwif->irq)
@@ -457,8 +467,6 @@
hwif->autodma = 0;
hwif->tuneproc = &atiixp_tuneproc;
hwif->speedproc = &atiixp_speedproc;
- hwif->ide_dma_host_on = &atiixp_ide_dma_host_on;
- hwif->ide_dma_host_off = &atiixp_ide_dma_host_off;
hwif->drives[0].autotune = 1;
hwif->drives[1].autotune = 1;
@@ -471,6 +479,8 @@
hwif->swdma_mask = 0x04;
hwif->udma_four = 1;
+ hwif->ide_dma_host_on = &atiixp_ide_dma_host_on;
+ hwif->ide_dma_host_off = &atiixp_ide_dma_host_off;
hwif->ide_dma_check = &atiixp_dma_check;
if (!noautodma)
hwif->autodma = 1;
@@ -480,23 +490,6 @@
}
/**
- * init_dma_atiixp - set up the ATIIXP DMA
- * @hwif: IDE interface
- * @dmabase: DMA PCI base
- *
- * Set up the DMA on the ATIIXP controller, providing a DMA base is
- * available. The ATIIXP follows the normal specs so we do nothing
- * magical here.
- */
-
-static void __init init_dma_atiixp (ide_hwif_t *hwif, unsigned long dmabase)
-{
- ide_setup_dma(hwif, dmabase, 8);
-}
-
-extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
-
-/**
* init_setup_atiixp - callback for IDE initialize
* @dev: ATIIXP PCI device
* @d: IDE pci info
@@ -504,12 +497,27 @@
* Enable the xp fixup for the ATIIXP controller and then perform
* a standard ide PCI setup
*/
-
-static void __init init_setup_atiixp (struct pci_dev *dev, ide_pci_device_t *d)
+
+static void __devinit init_setup_atiixp(struct pci_dev *dev, ide_pci_device_t *d)
{
ide_setup_pci_device(dev, d);
}
+static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
+ { /* 0 */
+ .vendor = PCI_VENDOR_ID_ATI,
+ .device = PCI_DEVICE_ID_ATI_IXP_IDE,
+ .name = "ATIIXP",
+ .init_setup = init_setup_atiixp,
+ .init_chipset = init_chipset_atiixp,
+ .init_hwif = init_hwif_atiixp,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
+ .bootable = ON_BOARD,
+ }
+};
+
/**
* atiixp_init_one - called when a ATIIXP is found
* @dev: the atiixp device
@@ -518,7 +526,7 @@
* Called when the PCI registration layer (or the IDE initialization)
* finds a device matching our IDE device tables.
*/
-
+
static int __devinit atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{
ide_pci_device_t *d = &atiixp_pci_info[id->driver_data];
@@ -526,11 +534,10 @@
if (dev->device != d->device)
BUG();
d->init_setup(dev, d);
- MOD_INC_USE_COUNT;
return 0;
}
-static struct pci_device_id atiixp_pci_tbl[] __devinitdata = {
+static struct pci_device_id atiixp_pci_tbl[] = {
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{ 0, },
};
@@ -549,12 +556,5 @@
-static void atiixp_ide_exit(void)
-{
- ide_pci_unregister_driver(&driver);
-}
-
module_init(atiixp_ide_init);
-module_exit(atiixp_ide_exit);
MODULE_AUTHOR("HUI YU");
MODULE_DESCRIPTION("PCI driver module for ATI IXP IDE");
MODULE_LICENSE("GPL");
-
reverted:
--- linux-2.6.3-root/drivers/ide/pci/atiixp.h 2004-02-25 19:33:25.992008544 +0100
+++ /dev/null 2004-01-17 00:25:55.000000000 +0100
@@ -1,84 +0,0 @@
-#ifndef ATIIXP_H
-#define ATIIXP_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-#define ATIIXP_DEBUG_DRIVE_INFO 1
-
-#define DISPLAY_ATIIXP_TIMINGS
-
-#if defined(DISPLAY_ATIIXP_TIMINGS) && defined(CONFIG_PROC_FS)
-#include <linux/stat.h>
-#include <linux/proc_fs.h>
-
-static u8 atiixp_proc;
-
-static int atiixp_get_info(char *, char **, off_t, int);
-
-static ide_pci_host_proc_t atiixp_procs[] __devinitdata = {
- {
- .name = "atiixp",
- .set = 1,
- .get_info = atiixp_get_info,
- .parent = NULL,
- },
-};
-#endif /* defined(DISPLAY_ATIIXP_TIMINGS) && defined(CONFIG_PROC_FS) */
-
-static void init_setup_atiixp(struct pci_dev *, ide_pci_device_t *);
-static unsigned int __devinit init_chipset_atiixp(struct pci_dev *, const char *);
-static void init_hwif_atiixp(ide_hwif_t *);
-static void init_dma_atiixp(ide_hwif_t *, unsigned long);
-
-
-/*
- * Table of the various ATIIXP capability blocks
- *
- */
-
-static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
- { /* 0 */
- .vendor = PCI_VENDOR_ID_ATI,
- .device = PCI_DEVICE_ID_ATI_IXP_IDE,
- .name = "ATIIXP",
- .init_setup = init_setup_atiixp,
- .init_chipset = init_chipset_atiixp,
- .init_iops = NULL,
- .init_hwif = init_hwif_atiixp,
- .init_dma = init_dma_atiixp,
- .channels = 2,
- .autodma = AUTODMA,
- .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
- .bootable = ON_BOARD,
- .extra = 0,
- }
-};
-
-#define ATIIXP_IDE_PIO_TIMING 0x40
-#define ATIIXP_IDE_MDMA_TIMING 0x44
-#define ATIIXP_IDE_PIO_CONTROL 0x48
-#define ATIIXP_IDE_PIO_MODE 0x4a
-#define ATIIXP_IDE_UDMA_CONTROL 0x54
-#define ATIIXP_IDE_UDMA_MODE 0x56
-
-typedef struct {
- u8 command_width;
- u8 recover_width;
-} atiixp_ide_timing;
-
-static atiixp_ide_timing pio_timing[] = {
- {0x05, 0x0d},
- {0x04, 0x07},
- {0x03, 0x04},
- {0x02, 0x02},
- {0x02, 0x00},
-};
-static atiixp_ide_timing mdma_timing[] = {
- {0x07, 0x07},
- {0x02, 0x01},
- {0x02, 0x00},
-};
-
-#endif /* ATIIXP_H */
diff -u linux-2.6.3-root/include/linux/pci_ids.h linux-2.6.3-root/include/linux/pci_ids.h
--- linux-2.6.3-root/include/linux/pci_ids.h 2004-02-25 19:33:25.994008240 +0100
+++ linux-2.6.3-root/include/linux/pci_ids.h 2004-02-25 18:39:40.119415720 +0100
@@ -344,7 +344,6 @@
#define PCI_DEVICE_ID_ATI_RS300_200 0x5833
/* ATI IXP Chipset */
#define PCI_DEVICE_ID_ATI_IXP_IDE 0x4349
-#define PCI_DEVICE_ID_ATI_IXP_AUDIO 0x4341
#define PCI_VENDOR_ID_VLSI 0x1004
#define PCI_DEVICE_ID_VLSI_82C592 0x0005