forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ARM: 7342/2: sa1100: prepare for sparse irq conversion
In preparation to convert SA1100 to sparse irq, set .nr_irqs for each machine and explicitly include mach/irqs.h as needed. Signed-off-by: Rob Herring <[email protected]> Signed-off-by: Russell King <[email protected]>
- Loading branch information
Rob Herring
authored and
Russell King
committed
Mar 25, 2012
1 parent
3638dd2
commit f314f33
Showing
21 changed files
with
40 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,6 @@ | |
#include <linux/mtd/mtd.h> | ||
#include <linux/mtd/partitions.h> | ||
|
||
#include <asm/irq.h> | ||
#include <mach/hardware.h> | ||
#include <asm/setup.h> | ||
|
||
|
@@ -30,6 +29,7 @@ | |
|
||
#include <mach/cerf.h> | ||
#include <mach/mcp.h> | ||
#include <mach/irqs.h> | ||
#include "generic.h" | ||
|
||
static struct resource cerfuart2_resources[] = { | ||
|
@@ -130,6 +130,7 @@ static void __init cerf_init(void) | |
MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube") | ||
/* Maintainer: [email protected] */ | ||
.map_io = cerf_map_io, | ||
.nr_irqs = SA1100_NR_IRQS, | ||
.init_irq = cerf_init_irq, | ||
.timer = &sa1100_timer, | ||
.init_machine = cerf_init, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -82,3 +82,5 @@ | |
#else | ||
#define NR_IRQS (IRQ_BOARD_START) | ||
#endif | ||
|
||
#define SA1100_NR_IRQS NR_IRQS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,9 +23,7 @@ | |
#include <linux/mtd/partitions.h> | ||
#include <video/s1d13xxxfb.h> | ||
|
||
#include <mach/hardware.h> | ||
#include <asm/hardware/sa1111.h> | ||
#include <asm/irq.h> | ||
#include <asm/page.h> | ||
#include <asm/mach-types.h> | ||
#include <asm/setup.h> | ||
|
@@ -34,6 +32,9 @@ | |
#include <asm/mach/map.h> | ||
#include <asm/mach/serial_sa1100.h> | ||
|
||
#include <mach/hardware.h> | ||
#include <mach/irqs.h> | ||
|
||
#include "generic.h" | ||
|
||
/* | ||
|
@@ -344,6 +345,7 @@ MACHINE_START(JORNADA720, "HP Jornada 720") | |
/* Maintainer: Kristoffer Ericson <[email protected]> */ | ||
.atag_offset = 0x100, | ||
.map_io = jornada720_map_io, | ||
.nr_irqs = SA1100_NR_IRQS, | ||
.init_irq = sa1100_init_irq, | ||
.timer = &sa1100_timer, | ||
.init_machine = jornada720_mach_init, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters