mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 14:19:16 +00:00
Code Issues Releases Wiki Activity

[MIPS] Lasat: Fix build by conversion to irq_cpu.c.

Browse source 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle 2007-10-14 23:49:33 +01:00
parent 951e471429
commit a5ccfe5c1a
4 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/mips/Kconfig
View file

@ -133,6 +133,7 @@ config LASAT
select DMA_NONCOHERENT select DMA_NONCOHERENT
select SYS_HAS_EARLY_PRINTK select SYS_HAS_EARLY_PRINTK
select HW_HAS_PCI select HW_HAS_PCI
select IRQ_CPU
select PCI_GT64XXX_PCI0 select PCI_GT64XXX_PCI0
select MIPS_NILE4 select MIPS_NILE4
select R5000_CPU_SCACHE select R5000_CPU_SCACHE

8
arch/mips/lasat/interrupt.c
View file

@ -26,6 +26,7 @@
#include <linux/kernel_stat.h> #include <linux/kernel_stat.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/irq_cpu.h>
#include <asm/lasat/lasatint.h> #include <asm/lasat/lasatint.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/gdb-stub.h> #include <asm/gdb-stub.h>
@ -88,7 +89,7 @@ asmlinkage void plat_irq_dispatch(void)
int irq; int irq;
if (cause & CAUSEF_IP7) { /* R4000 count / compare IRQ */ if (cause & CAUSEF_IP7) { /* R4000 count / compare IRQ */
ll_timer_interrupt(7); do_IRQ(7);
return; return;
} }
@ -96,7 +97,7 @@ asmlinkage void plat_irq_dispatch(void)
/* if int_status == 0, then the interrupt has already been cleared */ /* if int_status == 0, then the interrupt has already been cleared */
if (int_status) { if (int_status) {
irq = ls1bit32(int_status); irq = LASATINT_BASE + ls1bit32(int_status);
do_IRQ(irq); do_IRQ(irq);
} }
@ -125,6 +126,7 @@ void __init arch_init_irq(void)
panic("arch_init_irq: mips_machtype incorrect"); panic("arch_init_irq: mips_machtype incorrect");
} }
for (i = 0; i <= LASATINT_END; i++) mips_cpu_irq_init();
for (i = LASATINT_BASE; i <= LASATINT_END; i++)
set_irq_chip_and_handler(i, &lasat_irq_type, handle_level_irq); set_irq_chip_and_handler(i, &lasat_irq_type, handle_level_irq);
} }

19
arch/mips/pci/pci-lasat.c
View file

@ -10,6 +10,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/lasat/lasatint.h>
extern struct pci_ops nile4_pci_ops; extern struct pci_ops nile4_pci_ops;
extern struct pci_ops gt64xxx_pci0_ops; extern struct pci_ops gt64xxx_pci0_ops;
@ -54,15 +55,15 @@ static int __init lasat_pci_setup(void)
arch_initcall(lasat_pci_setup); arch_initcall(lasat_pci_setup);
#define LASATINT_ETH1 0 #define LASATINT_ETH1 (LASATINT_BASE + 0)
#define LASATINT_ETH0 1 #define LASATINT_ETH0 (LASATINT_BASE + 1)
#define LASATINT_HDC 2 #define LASATINT_HDC (LASATINT_BASE + 2)
#define LASATINT_COMP 3 #define LASATINT_COMP (LASATINT_BASE + 3)
#define LASATINT_HDLC 4 #define LASATINT_HDLC (LASATINT_BASE + 4)
#define LASATINT_PCIA 5 #define LASATINT_PCIA (LASATINT_BASE + 5)
#define LASATINT_PCIB 6 #define LASATINT_PCIB (LASATINT_BASE + 6)
#define LASATINT_PCIC 7 #define LASATINT_PCIC (LASATINT_BASE + 7)
#define LASATINT_PCID 8 #define LASATINT_PCID (LASATINT_BASE + 8)
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {

5
include/asm-mips/lasat/lasatint.h
View file

@ -1,7 +1,10 @@
#ifndef __ASM_LASAT_LASATINT_H #ifndef __ASM_LASAT_LASATINT_H
#define __ASM_LASAT_LASATINT_H #define __ASM_LASAT_LASATINT_H
#define LASATINT_END 16 #include <linux/irq.h>
#define LASATINT_BASE MIPS_CPU_IRQ_BASE
#define LASATINT_END (LASATINT_BASE + 16)
/* lasat 100 */ /* lasat 100 */
#define LASAT_INT_STATUS_REG_100 (KSEG1ADDR(0x1c880000)) #define LASAT_INT_STATUS_REG_100 (KSEG1ADDR(0x1c880000))