Merge with Linux 2.2.1.

1 files changed, 27 insertions, 33 deletions

diff --git a/include/asm-arm/arch-arc/ide.h b/include/asm-arm/arch-arc/ide.h
index 24bc4899d..2fc6ce282 100644
--- a/include/asm-arm/arch-arc/ide.h
+++ b/include/asm-arm/arch-arc/ide.h
@@ -8,50 +8,44 @@
  *
  * Modifications:
  *  04-04-1998	PJB	Merged `arc' and `a5k' versions
+ *  01-07-1998	RMK	Added new ide_ioregspec_t
+ *  29-07-1998	RMK	Major re-work of IDE architecture specific code
  */
 
 #include <linux/config.h>
 #include <asm/irq.h>
 
-static __inline__ int
-ide_default_irq(ide_ioreg_t base)
+/*
+ * Set up a hw structure for a specified data port, control port and IRQ.
+ * This should follow whatever the default interface uses.
+ */
+static __inline__ void
+ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int irq)
 {
-#ifdef CONFIG_ARCH_A5K
-	if (base == 0x1f0)
-		return IRQ_HARDDISK;
-#endif
-	return 0;
-}
+	ide_ioreg_t reg = (ide_ioreg_t) data_port;
+	int i;
 
-static __inline__ ide_ioreg_t
-ide_default_io_base(int index)
-{
-#ifdef CONFIG_ARCH_A5K
-	if (index == 0)
-		return 0x1f0;
-#endif
-	return 0;
-}
+	memset(hw, 0, sizeof(*hw));
 
-static __inline__ int
-ide_default_stepping(int index)
-{
-	return 0;
+	for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
+		hw->io_ports[i] = reg;
+		reg += 1;
+	}
+	hw->io_ports[IDE_CONTROL_OFFSET] = (ide_ioreg_t) ctrl_port;
+	hw->irq = irq;
 }
 
+/*
+ * This registers the standard ports for this architecture with the IDE
+ * driver.
+ */
 static __inline__ void
-ide_init_hwif_ports (ide_ioreg_t *p, ide_ioreg_t base, int stepping, int *irq)
+ide_init_default_hwifs(void)
 {
-	ide_ioreg_t port = base;
-	ide_ioreg_t ctrl = base + 0x206;
-	int i;
+#ifdef CONFIG_ARCH_A5K
+	hw_regs_t hw;
 
-	i = 8;
-	while (i--) {
-		*p++ = port;
-		port += 1 << stepping;
-	}
-	*p++ = ctrl;
-	if (irq != NULL)
-		*irq = 0;
+	ide_init_hwif_ports(&hw, 0x1f0, 0x3f6, IRQ_HARDDISK);
+	ide_register_hw(&hw, NULL);
+#endif
 }