aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/drivers
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2007-09-10 12:06:44 +0900
committerPaul Mundt <lethal@linux-sh.org>2007-09-21 11:57:52 +0900
commit9d4c82625914c31fd21e341765d476784cc74f14 (patch)
tree5ad9918659ff4566fada530785bd21039dcee155 /arch/sh/drivers
parent897cfcd878ccc9c2b0f1b3bb00a2368c43feafc0 (diff)
downloadkernel_samsung_aries-9d4c82625914c31fd21e341765d476784cc74f14.zip
kernel_samsung_aries-9d4c82625914c31fd21e341765d476784cc74f14.tar.gz
kernel_samsung_aries-9d4c82625914c31fd21e341765d476784cc74f14.tar.bz2
sh: remove sh7780 interrupt controller hack from pci code
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>
Diffstat (limited to 'arch/sh/drivers')
-rw-r--r--arch/sh/drivers/pci/pci-sh7780.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c
index 5508e45..e516087 100644
--- a/arch/sh/drivers/pci/pci-sh7780.c
+++ b/arch/sh/drivers/pci/pci-sh7780.c
@@ -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)