sh: pci: Move se7780 INTC fixups out of pci-sh7780.c.
These fixups belong in the board INTC setup code, not in the middle of pci-sh7780.c. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
84971bb401
commit
b627b4ed3d
2 changed files with 8 additions and 26 deletions
|
@ -12,10 +12,13 @@
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/irq.h>
|
#include <linux/irq.h>
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <asm/irq.h>
|
#include <linux/irq.h>
|
||||||
#include <asm/io.h>
|
#include <linux/io.h>
|
||||||
#include <mach-se/mach/se7780.h>
|
#include <mach-se/mach/se7780.h>
|
||||||
|
|
||||||
|
#define INTC_BASE 0xffd00000
|
||||||
|
#define INTC_ICR1 (INTC_BASE+0x1c)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initialize IRQ setting
|
* Initialize IRQ setting
|
||||||
*/
|
*/
|
||||||
|
@ -43,4 +46,7 @@ void __init init_se7780_IRQ(void)
|
||||||
ctrl_outw((IRQPIN_PCCPW << IRQPOS_PCCPW), FPGA_INTSEL3);
|
ctrl_outw((IRQPIN_PCCPW << IRQPOS_PCCPW), FPGA_INTSEL3);
|
||||||
|
|
||||||
plat_irq_setup_pins(IRQ_MODE_IRQ); /* install handlers for IRQ0-7 */
|
plat_irq_setup_pins(IRQ_MODE_IRQ); /* install handlers for IRQ0-7 */
|
||||||
|
|
||||||
|
/* ICR1: detect low level(for 2ndcut) */
|
||||||
|
ctrl_outl(0xAAAA0000, INTC_ICR1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,20 +22,6 @@
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include "pci-sh4.h"
|
#include "pci-sh4.h"
|
||||||
|
|
||||||
#define INTC_BASE 0xffd00000
|
|
||||||
#define INTC_ICR0 (INTC_BASE+0x0)
|
|
||||||
#define INTC_ICR1 (INTC_BASE+0x1c)
|
|
||||||
#define INTC_INTPRI (INTC_BASE+0x10)
|
|
||||||
#define INTC_INTREQ (INTC_BASE+0x24)
|
|
||||||
#define INTC_INTMSK0 (INTC_BASE+0x44)
|
|
||||||
#define INTC_INTMSK1 (INTC_BASE+0x48)
|
|
||||||
#define INTC_INTMSK2 (INTC_BASE+0x40080)
|
|
||||||
#define INTC_INTMSKCLR0 (INTC_BASE+0x64)
|
|
||||||
#define INTC_INTMSKCLR1 (INTC_BASE+0x68)
|
|
||||||
#define INTC_INTMSKCLR2 (INTC_BASE+0x40084)
|
|
||||||
#define INTC_INT2MSKR (INTC_BASE+0x40038)
|
|
||||||
#define INTC_INT2MSKCR (INTC_BASE+0x4003c)
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initialization. Try all known PCI access methods. Note that we support
|
* Initialization. Try all known PCI access methods. Note that we support
|
||||||
* using both PCI BIOS and direct access: in such cases, we use I/O ports
|
* using both PCI BIOS and direct access: in such cases, we use I/O ports
|
||||||
|
@ -75,16 +61,6 @@ int __init sh7780_pci_init(struct pci_channel *chan)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Setup the INTC */
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((ret = sh4_pci_check_direct(chan)) != 0)
|
if ((ret = sh4_pci_check_direct(chan)) != 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
|
Reference in a new issue