diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 20:36:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 20:36:29 -0400 |
| commit | 0d19eac12031680dc5f5402921fb0c388e42f619 (patch) | |
| tree | 57302fb8778b6527c35175cc1edf228dd9f7abb9 /arch/arm/mach-realview | |
| parent | 56c10bf82c10588b743e75a13a7949e11b9fc942 (diff) | |
| parent | bba1594d348b59d6172e02bf74fba837c8273989 (diff) | |
Merge branch 'amba' of git://git.linaro.org/people/rmk/linux-arm
Pull #2 ARM updates from Russell King:
"Further ARM AMBA primecell updates which aren't included directly in
the previous commit. I wanted to keep these separate as they're
touching stuff outside arch/arm/."
* 'amba' of git://git.linaro.org/people/rmk/linux-arm:
ARM: 7362/1: AMBA: Add module_amba_driver() helper macro for amba_driver
ARM: 7335/1: mach-u300: do away with MMC config files
ARM: 7280/1: mmc: mmci: Cache MMCICLOCK and MMCIPOWER register
ARM: 7309/1: realview: fix unconnected interrupts on EB11MP
ARM: 7230/1: mmc: mmci: Fix PIO read for small SDIO packets
ARM: 7227/1: mmc: mmci: Prepare for SDIO before setting up DMA job
ARM: 7223/1: mmc: mmci: Fixup use of runtime PM and use autosuspend
ARM: 7221/1: mmc: mmci: Change from using legacy suspend
ARM: 7219/1: mmc: mmci: Change vdd_handler to a generic ios_handler
ARM: 7218/1: mmc: mmci: Provide option to configure bus signal direction
ARM: 7217/1: mmc: mmci: Put power register deviations in variant data
ARM: 7216/1: mmc: mmci: Do not release spinlock in request_end
ARM: 7215/1: mmc: mmci: Increase max_segs from 16 to 128
Diffstat (limited to 'arch/arm/mach-realview')
| -rw-r--r-- | arch/arm/mach-realview/include/mach/irqs-eb.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/arch/arm/mach-realview/include/mach/irqs-eb.h b/arch/arm/mach-realview/include/mach/irqs-eb.h index 204d5378f309..d6b5073692d2 100644 --- a/arch/arm/mach-realview/include/mach/irqs-eb.h +++ b/arch/arm/mach-realview/include/mach/irqs-eb.h | |||
| @@ -96,16 +96,19 @@ | |||
| 96 | #define IRQ_EB11MP_L220_SLAVE (IRQ_EB_GIC_START + 30) | 96 | #define IRQ_EB11MP_L220_SLAVE (IRQ_EB_GIC_START + 30) |
| 97 | #define IRQ_EB11MP_L220_DECODE (IRQ_EB_GIC_START + 31) | 97 | #define IRQ_EB11MP_L220_DECODE (IRQ_EB_GIC_START + 31) |
| 98 | 98 | ||
| 99 | #define IRQ_EB11MP_UART2 -1 | 99 | /* |
| 100 | #define IRQ_EB11MP_UART3 -1 | 100 | * The 11MPcore tile leaves the following unconnected. |
| 101 | #define IRQ_EB11MP_CLCD -1 | 101 | */ |
| 102 | #define IRQ_EB11MP_DMA -1 | 102 | #define IRQ_EB11MP_UART2 0 |
| 103 | #define IRQ_EB11MP_WDOG -1 | 103 | #define IRQ_EB11MP_UART3 0 |
| 104 | #define IRQ_EB11MP_GPIO0 -1 | 104 | #define IRQ_EB11MP_CLCD 0 |
| 105 | #define IRQ_EB11MP_GPIO1 -1 | 105 | #define IRQ_EB11MP_DMA 0 |
| 106 | #define IRQ_EB11MP_GPIO2 -1 | 106 | #define IRQ_EB11MP_WDOG 0 |
| 107 | #define IRQ_EB11MP_SCI -1 | 107 | #define IRQ_EB11MP_GPIO0 0 |
| 108 | #define IRQ_EB11MP_SSP -1 | 108 | #define IRQ_EB11MP_GPIO1 0 |
| 109 | #define IRQ_EB11MP_GPIO2 0 | ||
| 110 | #define IRQ_EB11MP_SCI 0 | ||
| 111 | #define IRQ_EB11MP_SSP 0 | ||
| 109 | 112 | ||
| 110 | #define NR_GIC_EB11MP 2 | 113 | #define NR_GIC_EB11MP 2 |
| 111 | 114 | ||