sh: remove sh7780 interrupt controller hack from pci code
authorMagnus Damm <damm@igel.co.jp>
Mon, 10 Sep 2007 03:06:44 +0000 (12:06 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 21 Sep 2007 02:57:52 +0000 (11:57 +0900)
This patch removes the sh778x specific pci code that pokes in the
interrupt controller and overwrites things. The new and improved IRL
code manages this in plat_irq_setup() and plat_irq_setup_pins()
instead.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/drivers/pci/pci-sh7780.c

index 5508e45d48389f0a8f34dcf4e44761a2068cd00f..e516087fb435f1ea16b66e00e9795ab9c6cf7e30 100644 (file)
@@ -79,19 +79,6 @@ static int __init sh7780_pci_init(void)
                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)