5 files changed, 45 insertions, 17 deletions

diff --git a/arch/sh/drivers/pci/Makefile b/arch/sh/drivers/pci/Makefile
index cc8d0d0b1427..8a7e70651939 100644
--- a/arch/sh/drivers/pci/Makefile
+++ b/arch/sh/drivers/pci/Makefile
@@ -8,12 +8,13 @@ obj-$(CONFIG_PCI_AUTO)			+= pci-auto.o
 obj-$(CONFIG_CPU_SUBTYPE_ST40STB1)      += pci-st40.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7751)        += pci-sh7751.o ops-sh4.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7780)        += pci-sh7780.o ops-sh4.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7785)        += pci-sh7780.o ops-sh4.o
 
 obj-$(CONFIG_SH_DREAMCAST)              += ops-dreamcast.o fixups-dreamcast.o \
                                            dma-dreamcast.o
 obj-$(CONFIG_SH_SECUREEDGE5410)         += ops-snapgear.o
 obj-$(CONFIG_SH_RTS7751R2D)             += ops-rts7751r2d.o fixups-rts7751r2d.o
 obj-$(CONFIG_SH_SH03)                   += ops-sh03.o fixups-sh03.o
-obj-$(CONFIG_SH_R7780RP)                += ops-r7780rp.o fixups-r7780rp.o
+obj-$(CONFIG_SH_HIGHLANDER)             += ops-r7780rp.o fixups-r7780rp.o
 obj-$(CONFIG_SH_TITAN)                  += ops-titan.o
 obj-$(CONFIG_SH_LANDISK)                += ops-landisk.o
diff --git a/arch/sh/drivers/pci/ops-r7780rp.c b/arch/sh/drivers/pci/ops-r7780rp.c
index eeea1577e112..6f4fb38bafa2 100644
--- a/arch/sh/drivers/pci/ops-r7780rp.c
+++ b/arch/sh/drivers/pci/ops-r7780rp.c
@@ -17,18 +17,35 @@
 #include <asm/io.h>
 #include "pci-sh4.h"
 
+static char r7780rp_irq_tab[] __initdata = {
+        0, 1, 2, 3,
+};
+
+static char r7780mp_irq_tab[] __initdata = {
+        65, 66, 67, 68,
+};
+
+static char r7785rp_irq_tab[][4] __initdata = {
+        { 65, 66, 67, 68 },     /* INT ABCD */
+        { 66, 67, 68, 65 },     /* INT BCDA */
+        { 67, 68, 65, 66 },     /* INT CDAB */
+        { 68, 65, 66, 67 },     /* INT DABC */
+        { 64, 64, 64, 64 },     /* PCI Host */
+};
+
 int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
 {
-        switch (slot) {
-        case 0: return IRQ_PCISLOT1;            /* PCI Interrupt #1 */
-        case 1: return IRQ_PCISLOT2;            /* PCI Interrupt #2 */
-        case 2: return IRQ_PCISLOT3;            /* PCI Interrupt #3 */
-        case 3: return IRQ_PCISLOT4;            /* PCI Interrupt E4 */
-        default:
-                printk(KERN_ERR "PCI: Bad IRQ mapping "
-                       "request for slot %d, func %d\n", slot, pin-1);
-                return -1;
-        }
+        if (mach_is_r7780rp())
+                return r7780rp_irq_tab[slot];
+        if (mach_is_r7780mp())
+                return r7780mp_irq_tab[slot];
+        if (mach_is_r7785rp())
+                return r7785rp_irq_tab[slot][pin];
+
+        printk(KERN_ERR "PCI: Bad IRQ mapping "
+               "request for slot %d, func %d\n", slot, pin-1);
+
+        return -1;
 }
 
 static struct resource sh7780_io_resource = {
diff --git a/arch/sh/drivers/pci/pci-sh4.h b/arch/sh/drivers/pci/pci-sh4.h
index 5a61d6041f2c..1901c33cde6a 100644
--- a/arch/sh/drivers/pci/pci-sh4.h
+++ b/arch/sh/drivers/pci/pci-sh4.h
@@ -1,7 +1,7 @@
 #ifndef __PCI_SH4_H
 #define __PCI_SH4_H
 
-#ifdef CONFIG_CPU_SUBTYPE_SH7780
+#if defined(CONFIG_CPU_SUBTYPE_SH7780) || defined(CONFIG_CPU_SUBTYPE_SH7785)
 #include "pci-sh7780.h"
 #else
 #include "pci-sh7751.h"
diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c
index 602b644c35ad..16b30a9e94bb 100644
--- a/arch/sh/drivers/pci/pci-sh7780.c
+++ b/arch/sh/drivers/pci/pci-sh7780.c
@@ -48,7 +48,7 @@
 static int __init sh7780_pci_init(void)
 {
         unsigned int id;
-        int ret;
+        int ret, match = 0;
 
         pr_debug("PCI: Starting intialization.\n");
 
@@ -56,8 +56,17 @@ static int __init sh7780_pci_init(void)
 
         /* check for SH7780/SH7780R hardware */
         id = pci_read_reg(SH7780_PCIVID);
-        if ((id != ((SH7780_DEVICE_ID << 16) | SH7780_VENDOR_ID)) &&
-            (id != ((SH7781_DEVICE_ID << 16) | SH7780_VENDOR_ID))) {
+        if ((id & 0xffff) == SH7780_VENDOR_ID) {
+                switch ((id >> 16) & 0xffff) {
+                case SH7780_DEVICE_ID:
+                case SH7781_DEVICE_ID:
+                case SH7785_DEVICE_ID:
+                        match = 1;
+                        break;
+                }
+        }
+
+        if (unlikely(!match)) {
                 printk(KERN_ERR "PCI: This is not an SH7780 (%x)\n", id);
                 return -ENODEV;
         }
@@ -138,7 +147,7 @@ int __init sh7780_pcic_init(struct sh4_pci_address_map *map)
          * DMA interrupts...
          */
 
-#ifdef CONFIG_SH_R7780RP
+#ifdef CONFIG_SH_HIGHLANDER
         pci_fixup_pcic();
 #endif
 
diff --git a/arch/sh/drivers/pci/pci-sh7780.h b/arch/sh/drivers/pci/pci-sh7780.h
index f02d2180a4bc..bd44255509e6 100644
--- a/arch/sh/drivers/pci/pci-sh7780.h
+++ b/arch/sh/drivers/pci/pci-sh7780.h
@@ -14,8 +14,9 @@
 
 /* Platform Specific Values */
 #define SH7780_VENDOR_ID        0x1912
-#define SH7780_DEVICE_ID        0x0002
 #define SH7781_DEVICE_ID        0x0001
+#define SH7780_DEVICE_ID        0x0002
+#define SH7785_DEVICE_ID        0x0007
 
 /* SH7780 Control Registers */
 #define SH7780_PCI_VCR0         0xFE000000