diff options
author | Magnus Damm <damm@igel.co.jp> | 2007-09-09 23:06:44 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-09-20 22:57:52 -0400 |
commit | 9d4c82625914c31fd21e341765d476784cc74f14 (patch) | |
tree | 5ad9918659ff4566fada530785bd21039dcee155 /arch/sh/drivers | |
parent | 897cfcd878ccc9c2b0f1b3bb00a2368c43feafc0 (diff) |
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.c | 13 |
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 5508e45d4838..e516087fb435 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) | |||
79 | ctrl_outl(0xAAAA0000, INTC_ICR1); | 79 | ctrl_outl(0xAAAA0000, INTC_ICR1); |
80 | /* INTPRI: priority=3(all) */ | 80 | /* INTPRI: priority=3(all) */ |
81 | ctrl_outl(0x33333333, INTC_INTPRI); | 81 | ctrl_outl(0x33333333, INTC_INTPRI); |
82 | } else { | ||
83 | /* INTC SH-4 Mode */ | ||
84 | ctrl_outl(0x00200000, INTC_ICR0); | ||
85 | /* enable PCIINTA - PCIINTD */ | ||
86 | ctrl_outl(0x00078000, INTC_INT2MSKCR); | ||
87 | /* disable IRL4-7 Interrupt */ | ||
88 | ctrl_outl(0x40000000, INTC_INTMSK1); | ||
89 | /* disable IRL4-7 Interrupt */ | ||
90 | ctrl_outl(0x0000fffe, INTC_INTMSK2); | ||
91 | /* enable IRL0-3 Interrupt */ | ||
92 | ctrl_outl(0x80000000, INTC_INTMSKCLR1); | ||
93 | /* enable IRL0-3 Interrupt */ | ||
94 | ctrl_outl(0xfffe0000, INTC_INTMSKCLR2); | ||
95 | } | 82 | } |
96 | 83 | ||
97 | if ((ret = sh4_pci_check_direct()) != 0) | 84 | if ((ret = sh4_pci_check_direct()) != 0) |