Skip to content

Commit

Permalink
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Browse files Browse the repository at this point in the history
  • Loading branch information
Linus Torvalds committed Jun 27, 2005
2 parents 5f6b551 + 26799e6 commit 41b6c37
Show file tree
Hide file tree
Showing 28 changed files with 73 additions and 55 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-aaec2000/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ aaec2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static struct irqaction aaec2000_timer_irq = {
.name = "AAEC-2000 Timer Tick",
.flags = SA_INTERRUPT,
.handler = aaec2000_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = aaec2000_timer_interrupt,
};

static void __init aaec2000_timer_init(void)
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-clps711x/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ p720t_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static struct irqaction clps711x_timer_irq = {
.name = "CLPS711x Timer Tick",
.flags = SA_INTERRUPT,
.handler = p720t_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = p720t_timer_interrupt,
};

static void __init clps711x_timer_init(void)
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-clps7500/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,8 @@ clps7500_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static struct irqaction clps7500_timer_irq = {
.name = "CLPS7500 Timer Tick",
.flags = SA_INTERRUPT,
.handler = clps7500_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = clps7500_timer_interrupt,
};

/*
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-ebsa110/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ ebsa110_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static struct irqaction ebsa110_timer_irq = {
.name = "EBSA110 Timer Tick",
.flags = SA_INTERRUPT,
.handler = ebsa110_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = ebsa110_timer_interrupt,
};

/*
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-epxa10db/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ epxa10db_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static struct irqaction epxa10db_timer_irq = {
.name = "Excalibur Timer Tick",
.flags = SA_INTERRUPT,
.handler = epxa10db_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = epxa10db_timer_interrupt,
};

/*
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-footbridge/dc21285-timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ timer1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction footbridge_timer_irq = {
.name = "Timer1 timer tick",
.handler = timer1_interrupt,
.flags = SA_INTERRUPT,
.flags = SA_INTERRUPT | SA_TIMER,
};

/*
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-footbridge/isa-timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ isa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction isa_timer_irq = {
.name = "ISA timer tick",
.handler = isa_timer_interrupt,
.flags = SA_INTERRUPT,
.flags = SA_INTERRUPT | SA_TIMER,
};

static void __init isa_timer_init(void)
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-h720x/cpu-h7201.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ h7201_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static struct irqaction h7201_timer_irq = {
.name = "h7201 Timer Tick",
.flags = SA_INTERRUPT,
.handler = h7201_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = h7201_timer_interrupt,
};

/*
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-h720x/cpu-h7202.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ static struct irqchip h7202_timerx_chip = {

static struct irqaction h7202_timer_irq = {
.name = "h7202 Timer Tick",
.flags = SA_INTERRUPT,
.handler = h7202_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = h7202_timer_interrupt,
};

/*
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-imx/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ imx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static struct irqaction imx_timer_irq = {
.name = "i.MX Timer Tick",
.flags = SA_INTERRUPT,
.handler = imx_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = imx_timer_interrupt,
};

/*
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-integrator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static struct irqaction integrator_timer_irq = {
.name = "Integrator Timer Tick",
.flags = SA_INTERRUPT,
.handler = integrator_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = integrator_timer_interrupt,
};

/*
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-iop3xx/iop321-time.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ iop321_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction iop321_timer_irq = {
.name = "IOP321 Timer Tick",
.handler = iop321_timer_interrupt,
.flags = SA_INTERRUPT
.flags = SA_INTERRUPT | SA_TIMER,
};

static void __init iop321_timer_init(void)
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-iop3xx/iop331-time.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ iop331_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction iop331_timer_irq = {
.name = "IOP331 Timer Tick",
.handler = iop331_timer_interrupt,
.flags = SA_INTERRUPT
.flags = SA_INTERRUPT | SA_TIMER,
};

static void __init iop331_timer_init(void)
Expand Down
9 changes: 7 additions & 2 deletions arch/arm/mach-ixp2000/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@ static struct map_desc ixp2000_io_desc[] __initdata = {
.physical = IXP2000_PCI_CSR_PHYS_BASE,
.length = IXP2000_PCI_CSR_SIZE,
.type = MT_DEVICE
}, {
.virtual = IXP2000_MSF_VIRT_BASE,
.physical = IXP2000_MSF_PHYS_BASE,
.length = IXP2000_MSF_SIZE,
.type = MT_DEVICE
}, {
.virtual = IXP2000_PCI_IO_VIRT_BASE,
.physical = IXP2000_PCI_IO_PHYS_BASE,
Expand Down Expand Up @@ -194,8 +199,8 @@ static int ixp2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static struct irqaction ixp2000_timer_irq = {
.name = "IXP2000 Timer Tick",
.flags = SA_INTERRUPT,
.handler = ixp2000_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = ixp2000_timer_interrupt,
};

void __init ixp2000_init_time(unsigned long tick_rate)
Expand Down
6 changes: 0 additions & 6 deletions arch/arm/mach-ixp2000/ixdp2800.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@
#include <asm/mach/flash.h>
#include <asm/mach/arch.h>


void ixdp2400_init_irq(void)
{
ixdp2x00_init_irq(IXDP2800_CPLD_INT_STAT, IXDP2800_CPLD_INT_MASK, IXDP2400_NR_IRQS);
}

/*************************************************************************
* IXDP2800 timer tick
*************************************************************************/
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-ixp4xx/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,8 @@ static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id, struct pt_regs

static struct irqaction ixp4xx_timer_irq = {
.name = "IXP4xx Timer Tick",
.flags = SA_INTERRUPT,
.handler = ixp4xx_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = ixp4xx_timer_interrupt,
};

static void __init ixp4xx_timer_init(void)
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-lh7a40x/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ lh7a40x_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static struct irqaction lh7a40x_timer_irq = {
.name = "LHA740x Timer Tick",
.flags = SA_INTERRUPT,
.handler = lh7a40x_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = lh7a40x_timer_interrupt,
};

static void __init lh7a40x_timer_init(void)
Expand Down
10 changes: 5 additions & 5 deletions arch/arm/mach-omap/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ static irqreturn_t omap_mpu_timer_interrupt(int irq, void *dev_id,

static struct irqaction omap_mpu_timer_irq = {
.name = "mpu timer",
.flags = SA_INTERRUPT,
.handler = omap_mpu_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = omap_mpu_timer_interrupt,
};

static unsigned long omap_mpu_timer1_overflows;
Expand All @@ -203,7 +203,7 @@ static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id,
static struct irqaction omap_mpu_timer1_irq = {
.name = "mpu timer1 overflow",
.flags = SA_INTERRUPT,
.handler = omap_mpu_timer1_interrupt
.handler = omap_mpu_timer1_interrupt,
};

static __init void omap_init_mpu_timer(void)
Expand Down Expand Up @@ -349,8 +349,8 @@ static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id,

static struct irqaction omap_32k_timer_irq = {
.name = "32KHz timer",
.flags = SA_INTERRUPT,
.handler = omap_32k_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = omap_32k_timer_interrupt,
};

static __init void omap_init_32k_timer(void)
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-pxa/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ pxa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static struct irqaction pxa_timer_irq = {
.name = "PXA Timer Tick",
.flags = SA_INTERRUPT,
.handler = pxa_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = pxa_timer_interrupt,
};

static void __init pxa_timer_init(void)
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-s3c2410/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ s3c2410_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static struct irqaction s3c2410_timer_irq = {
.name = "S3C2410 Timer Tick",
.flags = SA_INTERRUPT,
.handler = s3c2410_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = s3c2410_timer_interrupt,
};

/*
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sa1100/h3600.c
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ static void h3800_IRQ_demux(unsigned int irq, struct irqdesc *desc, struct pt_re
static struct irqaction h3800_irq = {
.name = "h3800_asic",
.handler = h3800_IRQ_demux,
.flags = SA_INTERRUPT,
.flags = SA_INTERRUPT | SA_TIMER,
};

u32 kpio_int_shadow = 0;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-sa1100/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ sa1100_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static struct irqaction sa1100_timer_irq = {
.name = "SA11xx Timer Tick",
.flags = SA_INTERRUPT,
.handler = sa1100_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = sa1100_timer_interrupt,
};

static void __init sa1100_timer_init(void)
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-shark/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ shark_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static struct irqaction shark_timer_irq = {
.name = "Shark Timer Tick",
.flags = SA_INTERRUPT,
.handler = shark_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = shark_timer_interrupt,
};

/*
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-versatile/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -875,8 +875,8 @@ static irqreturn_t versatile_timer_interrupt(int irq, void *dev_id, struct pt_re

static struct irqaction versatile_timer_irq = {
.name = "Versatile Timer Tick",
.flags = SA_INTERRUPT,
.handler = versatile_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = versatile_timer_interrupt,
};

/*
Expand Down
4 changes: 2 additions & 2 deletions include/asm-arm/arch-ixp2000/ixdp2x00.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
* On board CPLD memory map
*/
#define IXDP2X00_PHYS_CPLD_BASE 0xc7000000
#define IXDP2X00_VIRT_CPLD_BASE 0xfafff000
#define IXDP2X00_CPLD_SIZE 0x00001000
#define IXDP2X00_VIRT_CPLD_BASE 0xfe000000
#define IXDP2X00_CPLD_SIZE 0x00100000


#define IXDP2X00_CPLD_REG(x) \
Expand Down
4 changes: 2 additions & 2 deletions include/asm-arm/arch-ixp2000/ixdp2x01.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#define __IXDP2X01_H__

#define IXDP2X01_PHYS_CPLD_BASE 0xc6024000
#define IXDP2X01_VIRT_CPLD_BASE 0xfafff000
#define IXDP2X01_CPLD_REGION_SIZE 0x00001000
#define IXDP2X01_VIRT_CPLD_BASE 0xfe000000
#define IXDP2X01_CPLD_REGION_SIZE 0x00100000

#define IXDP2X01_CPLD_VIRT_REG(reg) (volatile unsigned long*)(IXDP2X01_VIRT_CPLD_BASE | reg)
#define IXDP2X01_CPLD_PHYS_REG(reg) (volatile u32*)(IXDP2X01_PHYS_CPLD_BASE | reg)
Expand Down
19 changes: 19 additions & 0 deletions include/asm-arm/arch-ixp2000/ixp2000-regs.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,21 @@
#ifndef _IXP2000_REGS_H_
#define _IXP2000_REGS_H_

/*
* IXP2000 linux memory map:
*
* virt phys size
* fb000000 db000000 16M PCI CFG1
* fc000000 da000000 16M PCI CFG0
* fd000000 d8000000 16M PCI I/O
* fe[0-7]00000 8M per-platform mappings
* feb00000 c8000000 1M MSF
* fec00000 df000000 1M PCI CSRs
* fed00000 de000000 1M PCI CREG
* fee00000 d6000000 1M INTCTL
* fef00000 c0000000 1M CAP
*/

/*
* Static I/O regions.
*
Expand Down Expand Up @@ -71,6 +86,10 @@
#define IXP2000_PCI_CSR_VIRT_BASE 0xfec00000
#define IXP2000_PCI_CSR_SIZE 0x00100000

#define IXP2000_MSF_PHYS_BASE 0xc8000000
#define IXP2000_MSF_VIRT_BASE 0xfeb00000
#define IXP2000_MSF_SIZE 0x00100000

#define IXP2000_PCI_IO_PHYS_BASE 0xd8000000
#define IXP2000_PCI_IO_VIRT_BASE 0xfd000000
#define IXP2000_PCI_IO_SIZE 0x01000000
Expand Down
2 changes: 1 addition & 1 deletion include/asm-arm/arch-ixp2000/vmalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
* The vmalloc() routines leaves a hole of 4kB between each vmalloced
* area for the same reason. ;)
*/
#define VMALLOC_END 0xfaffefff
#define VMALLOC_END 0xfb000000

0 comments on commit 41b6c37

Please sign in to comment.