1 files changed, 34 insertions, 11 deletions

diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c
index 602b644c35ad..5508e45d4838 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,19 +56,43 @@ 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;
         }
 
         /* Setup the INTC */
-        ctrl_outl(0x00200000, INTC_ICR0);       /* INTC SH-4 Mode */
-        ctrl_outl(0x00078000, INTC_INT2MSKCR);  /* enable PCIINTA - PCIINTD */
-        ctrl_outl(0x40000000, INTC_INTMSK1);    /* disable IRL4-7 Interrupt */
-        ctrl_outl(0x0000fffe, INTC_INTMSK2);    /* disable IRL4-7 Interrupt */
-        ctrl_outl(0x80000000, INTC_INTMSKCLR1); /* enable IRL0-3 Interrupt */
-        ctrl_outl(0xfffe0000, INTC_INTMSKCLR2); /* enable IRL0-3 Interrupt */
+        if (mach_is_7780se()) {
+                /* ICR0: IRL=use separately */
+                ctrl_outl(0x00C00020, INTC_ICR0);
+                /* ICR1: detect low level(for 2ndcut) */
+                ctrl_outl(0xAAAA0000, INTC_ICR1);
+                /* INTPRI: priority=3(all) */
+                ctrl_outl(0x33333333, INTC_INTPRI);
+        } else {
+                /* INTC SH-4 Mode */
+                ctrl_outl(0x00200000, INTC_ICR0);
+                /* enable PCIINTA - PCIINTD */
+                ctrl_outl(0x00078000, INTC_INT2MSKCR);
+                /* disable IRL4-7 Interrupt */
+                ctrl_outl(0x40000000, INTC_INTMSK1);
+                /* disable IRL4-7 Interrupt */
+                ctrl_outl(0x0000fffe, INTC_INTMSK2);
+                /* enable IRL0-3 Interrupt */
+                ctrl_outl(0x80000000, INTC_INTMSKCLR1);
+                /* enable IRL0-3 Interrupt */
+                ctrl_outl(0xfffe0000, INTC_INTMSKCLR2);
+        }
 
         if ((ret = sh4_pci_check_direct()) != 0)
                 return ret;
@@ -138,9 +162,8 @@ int __init sh7780_pcic_init(struct sh4_pci_address_map *map)
          * DMA interrupts...
          */
 
-#ifdef CONFIG_SH_R7780RP
+        /* Apply any last-minute PCIC fixups */
         pci_fixup_pcic();
-#endif
 
         /* SH7780 init done, set central function init complete */
         /* use round robin mode to stop a device starving/overruning */