Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / ide.h

diff --git a/include/asm-powerpc/ide.h b/include/asm-powerpc/ide.h
index 6d50310ecaea558b8ee9f93ecae44478c266bd56..3d90bf7d3d73ed19ae011c20b576f422b07e5868 100644 (file)
--- a/include/asm-powerpc/ide.h
+++ b/include/asm-powerpc/ide.h
@@ -31,39 +31,48 @@
 #include <linux/hdreg.h>
 #include <linux/ioport.h>
 
-struct ide_machdep_calls {
-        int         (*default_irq)(unsigned long base);
-        unsigned long (*default_io_base)(int index);
-        void        (*ide_init_hwif)(hw_regs_t *hw,
-                                     unsigned long data_port,
-                                     unsigned long ctrl_port,
-                                     int *irq);
-};
-
-extern struct ide_machdep_calls ppc_ide_md;
-
-#define IDE_ARCH_OBSOLETE_DEFAULTS
-
+/* FIXME: use ide_platform host driver */
 static __inline__ int ide_default_irq(unsigned long base)
 {
-       if (ppc_ide_md.default_irq)
-               return ppc_ide_md.default_irq(base);
+#ifdef CONFIG_PPLUS
+       switch (base) {
+       case 0x1f0:     return 14;
+       case 0x170:     return 15;
+       }
+#endif
+#ifdef CONFIG_PPC_PREP
+       switch (base) {
+       case 0x1f0:     return 13;
+       case 0x170:     return 13;
+       case 0x1e8:     return 11;
+       case 0x168:     return 10;
+       case 0xfff0:    return 14;      /* MCP(N)750 ide0 */
+       case 0xffe0:    return 15;      /* MCP(N)750 ide1 */
+       }
+#endif
        return 0;
 }
 
+/* FIXME: use ide_platform host driver */
 static __inline__ unsigned long ide_default_io_base(int index)
 {
-       if (ppc_ide_md.default_io_base)
-               return ppc_ide_md.default_io_base(index);
+#ifdef CONFIG_PPLUS
+       switch (index) {
+       case 0:         return 0x1f0;
+       case 1:         return 0x170;
+       }
+#endif
+#ifdef CONFIG_PPC_PREP
+       switch (index) {
+       case 0:         return 0x1f0;
+       case 1:         return 0x170;
+       case 2:         return 0x1e8;
+       case 3:         return 0x168;
+       }
+#endif
        return 0;
 }
 
-#ifdef CONFIG_PCI
-#define ide_init_default_irq(base)     (0)
-#else
-#define ide_init_default_irq(base)     ide_default_irq(base)
-#endif
-
 #ifdef CONFIG_BLK_DEV_MPC8xx_IDE
 #define IDE_ARCH_ACK_INTR  1
 #define ide_ack_intr(hwif) ((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1)
@@ -71,8 +80,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
 
 #endif /* __powerpc64__ */
 
-#define ide_default_io_ctl(base)       ((base) + 0x206) /* obsolete */
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_POWERPC_IDE_H */