Pb1200/DBAu1200: fix bad IDE resource size

[linux-2.6-omap-h63xx.git] / include / asm-mips / mach-db1x00 / db1200.h

diff --git a/include/asm-mips/mach-db1x00/db1200.h b/include/asm-mips/mach-db1x00/db1200.h
index 647fdb54cc1dd31a6f699bbb1c7a651b4ccd1304..d2e28e64932ed8141d8f4b29df85f8739fb963a2 100644 (file)
--- a/include/asm-mips/mach-db1x00/db1200.h
+++ b/include/asm-mips/mach-db1x00/db1200.h
@@ -25,6 +25,7 @@
 #define __ASM_DB1200_H
 
 #include <linux/types.h>
+#include <asm/mach-au1x00/au1xxx_psc.h>
 
 // This is defined in au1000.h with bogus value
 #undef AU1X00_EXTERNAL_INT
@@ -172,8 +173,8 @@ static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
 #define AU1XXX_SMC91111_IRQ                    DB1200_ETH_INT
 
 #define AU1XXX_ATA_PHYS_ADDR           (0x18800000)
-#define AU1XXX_ATA_PHYS_LEN                    (0x100)
-#define AU1XXX_ATA_REG_OFFSET  (5)
+#define AU1XXX_ATA_REG_OFFSET          (5)
+#define AU1XXX_ATA_PHYS_LEN            (16 << AU1XXX_ATA_REG_OFFSET)
 #define AU1XXX_ATA_INT                 DB1200_IDE_INT
 #define AU1XXX_ATA_DDMA_REQ            DSCR_CMD0_DMA_REQ1;
 #define AU1XXX_ATA_RQSIZE              128
@@ -181,29 +182,34 @@ static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
 #define NAND_PHYS_ADDR   0x20000000
 
 /*
- *     External Interrupts for Pb1200 as of 8/6/2004.
- *   Bit positions in the CPLD registers can be calculated by taking
- *   the interrupt define and subtracting the DB1200_INT_BEGIN value.
- *    *example: IDE bis pos is  = 64 - 64
-                ETH bit pos is  = 65 - 64
+ * External Interrupts for Pb1200 as of 8/6/2004.
+ * Bit positions in the CPLD registers can be calculated by taking
+ * the interrupt define and subtracting the DB1200_INT_BEGIN value.
+ *
+ *   Example: IDE bis pos is  = 64 - 64
+ *            ETH bit pos is  = 65 - 64
  */
-#define DB1200_INT_BEGIN               (AU1000_LAST_INTC1_INT + 1)
-#define DB1200_IDE_INT                 (DB1200_INT_BEGIN + 0)
-#define DB1200_ETH_INT                 (DB1200_INT_BEGIN + 1)
-#define DB1200_PC0_INT                 (DB1200_INT_BEGIN + 2)
-#define DB1200_PC0_STSCHG_INT  (DB1200_INT_BEGIN + 3)
-#define DB1200_PC1_INT                 (DB1200_INT_BEGIN + 4)
-#define DB1200_PC1_STSCHG_INT  (DB1200_INT_BEGIN + 5)
-#define DB1200_DC_INT                  (DB1200_INT_BEGIN + 6)
-#define DB1200_FLASHBUSY_INT   (DB1200_INT_BEGIN + 7)
-#define DB1200_PC0_INSERT_INT  (DB1200_INT_BEGIN + 8)
-#define DB1200_PC0_EJECT_INT   (DB1200_INT_BEGIN + 9)
-#define DB1200_PC1_INSERT_INT  (DB1200_INT_BEGIN + 10)
-#define DB1200_PC1_EJECT_INT   (DB1200_INT_BEGIN + 11)
-#define DB1200_SD0_INSERT_INT  (DB1200_INT_BEGIN + 12)
-#define DB1200_SD0_EJECT_INT   (DB1200_INT_BEGIN + 13)
-
-#define DB1200_INT_END                 (DB1200_INT_BEGIN + 15)
+enum external_pb1200_ints {
+       DB1200_INT_BEGIN        = AU1000_MAX_INTR + 1,
+
+       DB1200_IDE_INT          = DB1200_INT_BEGIN,
+       DB1200_ETH_INT,
+       DB1200_PC0_INT,
+       DB1200_PC0_STSCHG_INT,
+       DB1200_PC1_INT,
+       DB1200_PC1_STSCHG_INT,
+       DB1200_DC_INT,
+       DB1200_FLASHBUSY_INT,
+       DB1200_PC0_INSERT_INT,
+       DB1200_PC0_EJECT_INT,
+       DB1200_PC1_INSERT_INT,
+       DB1200_PC1_EJECT_INT,
+       DB1200_SD0_INSERT_INT,
+       DB1200_SD0_EJECT_INT,
+
+       DB1200_INT_END          = DB1200_INT_BEGIN + 15,
+};
+
 
 /* For drivers/pcmcia/au1000_db1x00.c */