aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-09-04 20:43:29 -0400
committerTony Lindgren <tony@atomide.com>2012-09-12 21:06:29 -0400
commit9ee073176808bba3039dabeaf6553ecdb9d7f765 (patch)
tree6c92e21cb95de6cd24886342b59c49eb3d9842ea /arch
parenta1e01703bacbadd22eb4aaca0bbba59bcba7d3b3 (diff)
ARM: OMAP1: Move define of OMAP_LCD_DMA to dma.h
This is needed to start removing hardcoded IRQs on omap2+. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-omap/include/plat/dma.h2
-rw-r--r--arch/arm/plat-omap/include/plat/irqs.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/dma.h b/arch/arm/plat-omap/include/plat/dma.h
index c5811d4409b0..0a87b052f8f7 100644
--- a/arch/arm/plat-omap/include/plat/dma.h
+++ b/arch/arm/plat-omap/include/plat/dma.h
@@ -31,6 +31,8 @@
31/* Move omap4 specific defines to dma-44xx.h */ 31/* Move omap4 specific defines to dma-44xx.h */
32#include "dma-44xx.h" 32#include "dma-44xx.h"
33 33
34#define INT_DMA_LCD 25
35
34/* DMA channels for omap1 */ 36/* DMA channels for omap1 */
35#define OMAP_DMA_NO_DEVICE 0 37#define OMAP_DMA_NO_DEVICE 0
36#define OMAP_DMA_MCSI1_TX 1 38#define OMAP_DMA_MCSI1_TX 1
diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h
index 37bbbbb981b2..15f497c2602e 100644
--- a/arch/arm/plat-omap/include/plat/irqs.h
+++ b/arch/arm/plat-omap/include/plat/irqs.h
@@ -53,7 +53,6 @@
53#define INT_DMA_CH3 22 53#define INT_DMA_CH3 22
54#define INT_DMA_CH4 23 54#define INT_DMA_CH4 23
55#define INT_DMA_CH5 24 55#define INT_DMA_CH5 24
56#define INT_DMA_LCD 25
57#define INT_TIMER1 26 56#define INT_TIMER1 26
58#define INT_WD_TIMER 27 57#define INT_WD_TIMER 27
59#define INT_BRIDGE_PUB 28 58#define INT_BRIDGE_PUB 28