[PATCH v1 7/9] OMAP1: DMA: Implement in platform device model

STALE5707d

4 messages, 3 authors, 2010-12-15 · open the first message on its own page

[PATCH v1 7/9] OMAP1: DMA: Implement in platform device model

From: Kevin Hilman <hidden>
Date: 2010-12-15 00:55:49

Kevin Hilman [off-list ref] writes:

[...]
Using the patch below which fixes up the interrupt numbers to match the
original code, the memory-to-memory test is now working on OSK.
Tony, if you prefer just to fold this into the original, feel free to
add

[khilman at deeprootsystems.com]: fixed IRQ numbers to match original code
Signed-off-by: Kevin Hilman <redacted>

quoted hunk
diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
index 17814e0..d855934 100644
--- a/arch/arm/mach-omap1/dma.c
+++ b/arch/arm/mach-omap1/dma.c
@@ -121,58 +121,58 @@ static struct resource res[] __initdata = {
 	/* Handled in lcd_dma.c */
 	[7] = {
 		.name   = "6",
-		.start  = INT_DMA_LCD,
+		.start  = INT_1610_DMA_CH6,
 		.flags  = IORESOURCE_IRQ,
 	},
 	/* irq's for omap16xx and omap7xx */
 	[8] = {
 		.name   = "7",
-		.start  = 53 + IH2_BASE,
+		.start  = INT_1610_DMA_CH7,
 		.flags  = IORESOURCE_IRQ,
 	},
 	[9] = {
 		.name   = "8",
-		.start  = 54 + IH2_BASE,
+		.start  = INT_1610_DMA_CH8,
 		.flags  = IORESOURCE_IRQ,
 	},
 	[10] = {
 		.name  = "9",
-		.start = 55 + IH2_BASE,
+		.start = INT_1610_DMA_CH9,
 		.flags = IORESOURCE_IRQ,
 	},
 	[11] = {
 		.name  = "10",
-		.start = 56 + IH2_BASE,
+		.start = INT_1610_DMA_CH10,
 		.flags = IORESOURCE_IRQ,
 	},
 	[12] = {
 		.name  = "11",
-		.start = 57 + IH2_BASE,
+		.start = INT_1610_DMA_CH11,
 		.flags = IORESOURCE_IRQ,
 	},
 	[13] = {
 		.name  = "12",
-		.start = 58 + IH2_BASE,
+		.start = INT_1610_DMA_CH12,
 		.flags = IORESOURCE_IRQ,
 	},
 	[14] = {
 		.name  = "13",
-		.start = 59 + IH2_BASE,
+		.start = INT_1610_DMA_CH13,
 		.flags = IORESOURCE_IRQ,
 	},
 	[15] = {
 		.name  = "14",
-		.start = 60 + IH2_BASE,
+		.start = INT_1610_DMA_CH14,
 		.flags = IORESOURCE_IRQ,
 	},
 	[16] = {
 		.name  = "15",
-		.start = 61 + IH2_BASE,
+		.start = INT_1610_DMA_CH15,
 		.flags = IORESOURCE_IRQ,
 	},
 	[17] = {
 		.name  = "16",
-		.start = 62 + IH2_BASE,
+		.start = INT_DMA_LCD,
 		.flags = IORESOURCE_IRQ,
 	},
 };

[PATCH v1 7/9] OMAP1: DMA: Implement in platform device model

From: tony@atomide.com (Tony Lindgren)
Date: 2010-12-15 01:04:00

* Kevin Hilman [off-list ref] [101214 16:55]:
Kevin Hilman [off-list ref] writes:

[...]
quoted
Using the patch below which fixes up the interrupt numbers to match the
original code, the memory-to-memory test is now working on OSK.
Tony, if you prefer just to fold this into the original, feel free to
add

[khilman at deeprootsystems.com]: fixed IRQ numbers to match original code
Signed-off-by: Kevin Hilman <redacted>
OK thanks, will fold it in and let's merge them into linux-omap
master branch for few days for testing. Then if everything looks
good, I'll queue these for the 2.6.38 next merge window.

Regards,

Tony

[PATCH v1 7/9] OMAP1: DMA: Implement in platform device model

From: G, Manjunath Kondaiah <hidden>
Date: 2010-12-15 02:01:23

On Tue, Dec 14, 2010 at 05:04:00PM -0800, Tony Lindgren wrote:
* Kevin Hilman [off-list ref] [101214 16:55]:
quoted
Kevin Hilman [off-list ref] writes:

[...]
quoted
Using the patch below which fixes up the interrupt numbers to match the
original code, the memory-to-memory test is now working on OSK.
Tony, if you prefer just to fold this into the original, feel free to
add

[khilman at deeprootsystems.com]: fixed IRQ numbers to match original code
Signed-off-by: Kevin Hilman <redacted>
OK thanks, will fold it in and let's merge them into linux-omap
master branch for few days for testing. Then if everything looks
good, I'll queue these for the 2.6.38 next merge window.
Thanks Tony.

-Manjunath

[PATCH v1 7/9] OMAP1: DMA: Implement in platform device model

From: tony@atomide.com (Tony Lindgren)
Date: 2010-12-15 02:44:34

* G, Manjunath Kondaiah [off-list ref] [101214 18:01]:
On Tue, Dec 14, 2010 at 05:04:00PM -0800, Tony Lindgren wrote:
quoted
OK thanks, will fold it in and let's merge them into linux-omap
master branch for few days for testing. Then if everything looks
good, I'll queue these for the 2.6.38 next merge window.
Oops, not quite ready yet, see the mail from Paul. Waiting for
those fixes.

Tony
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help