PCI: remove initial bios sort of PCI devices on x86

[linux-2.6] / include / asm-sh / r7780rp.h

diff --git a/include/asm-sh/r7780rp.h b/include/asm-sh/r7780rp.h
index 4083b59499286f402046345eebb5d12037f796b5..1770460a4616e6a7980dc5f142a6fcb1066b8b71 100644 (file)
--- a/include/asm-sh/r7780rp.h
+++ b/include/asm-sh/r7780rp.h
@@ -65,24 +65,6 @@
 #define PA_PMR          (PA_BCR+0x0900) /*  */
 
 #define IRLCNTR1        (PA_BCR + 0)    /* Interrupt Control Register1 */
-
-#define IRQ_PCISLOT1    65              /* PCI Slot #1 IRQ */
-#define IRQ_PCISLOT2    66              /* PCI Slot #2 IRQ */
-#define IRQ_PCISLOT3    67              /* PCI Slot #3 IRQ */
-#define IRQ_PCISLOT4    68              /* PCI Slot #4 IRQ */
-#define IRQ_TP          2               /* Touch Panel IRQ */
-#define IRQ_SCI1        3               /* SCI1 IRQ */
-#define IRQ_SCI0        4               /* SCI0 IRQ */
-#define IRQ_2SERIAL     5               /* Serial IRQ */
-#define IRQ_RTC         6               /* RTC A / B IRQ */
-#define IRQ_EXTENTION6  7               /* EXT6n IRQ */
-#define IRQ_EXTENTION5  8               /* EXT5n IRQ */
-#define IRQ_EXTENTION4  9               /* EXT4n IRQ */
-#define IRQ_EXTENTION2  10              /* EXT2n IRQ */
-#define IRQ_EXTENTION1  11              /* EXT1n IRQ */
-#define IRQ_ONETH       13              /* On board Ethernet IRQ */
-#define IRQ_PSW         14              /* Push Switch IRQ */
-
 #define IVDR_CK_ON     8               /* iVDR Clock ON */
 
 #elif defined(CONFIG_SH_R7780RP)
@@ -139,21 +121,6 @@
 
 #define IRLCNTR1       (PA_BCR + 0)    /* Interrupt Control Register1 */
 
-#define IRQ_PCISLOT1   0               /* PCI Slot #1 IRQ */
-#define IRQ_PCISLOT2   1               /* PCI Slot #2 IRQ */
-#define IRQ_PCISLOT3   2               /* PCI Slot #3 IRQ */
-#define IRQ_PCISLOT4   3               /* PCI Slot #4 IRQ */
-#define IRQ_CFINST     5               /* CF Card Insert IRQ */
-#define IRQ_M66596     6               /* M66596 IRQ */
-#define IRQ_SDCARD     7               /* SD Card IRQ */
-#define IRQ_TUCHPANEL  8               /* Touch Panel IRQ */
-#define IRQ_SCI                9               /* SCI IRQ */
-#define IRQ_2SERIAL    10              /* Serial IRQ */
-#define        IRQ_EXTENTION   11              /* EXTn IRQ */
-#define IRQ_ONETH      12              /* On board Ethernet IRQ */
-#define IRQ_PSW                13              /* Push Switch IRQ */
-#define IRQ_ZIGBEE     14              /* Ziggbee IO IRQ */
-
 #define IVDR_CK_ON     8               /* iVDR Clock ON */
 
 #elif defined(CONFIG_SH_R7785RP)
@@ -203,13 +170,29 @@
 #define PA_MMSR                (PA_BCR+0x0400)
 
 #define IVDR_CK_ON     4               /* iVDR Clock ON */
-
 #endif
 
-void make_r7780rp_irq(unsigned int irq);
-void highlander_init_irq(void);
-
-#define __IO_PREFIX    r7780rp
-#include <asm/io_generic.h>
+#define HL_FPGA_IRQ_BASE       200
+#define HL_NR_IRL              15
+
+#define IRQ_AX88796            (HL_FPGA_IRQ_BASE + 0)
+#define IRQ_CF                 (HL_FPGA_IRQ_BASE + 1)
+#define IRQ_PSW                        (HL_FPGA_IRQ_BASE + 2)
+#define IRQ_EXT0               (HL_FPGA_IRQ_BASE + 3)
+#define IRQ_EXT1               (HL_FPGA_IRQ_BASE + 4)
+#define IRQ_EXT2               (HL_FPGA_IRQ_BASE + 5)
+#define IRQ_EXT3               (HL_FPGA_IRQ_BASE + 6)
+#define IRQ_EXT4               (HL_FPGA_IRQ_BASE + 7)
+#define IRQ_EXT5               (HL_FPGA_IRQ_BASE + 8)
+#define IRQ_EXT6               (HL_FPGA_IRQ_BASE + 9)
+#define IRQ_EXT7               (HL_FPGA_IRQ_BASE + 10)
+#define IRQ_SMBUS              (HL_FPGA_IRQ_BASE + 11)
+#define IRQ_TP                 (HL_FPGA_IRQ_BASE + 12)
+#define IRQ_RTC                        (HL_FPGA_IRQ_BASE + 13)
+#define IRQ_TH_ALERT           (HL_FPGA_IRQ_BASE + 14)
+
+unsigned char *highlander_init_irq_r7780mp(void);
+unsigned char *highlander_init_irq_r7780rp(void);
+unsigned char *highlander_init_irq_r7785rp(void);
 
 #endif  /* __ASM_SH_RENESAS_R7780RP */