sh: Revert CONFIG_NR_ONCHIP_DMA_CHANNELS to MAX_DMA_CHANNELS

PATCH In review Nobuhiro Iwamatsu 2 participants 2 messages Mar 12, 2009 – Mar 16, 2009 SuperH

lore

Share & tools

lore

Nobuhiro Iwamatsu

author

2009-03-12 06:34 UTC #0 lore raw

PATCH 1/1 sh: Revert CONFIG_NR_ONCHIP_DMA_CHANNELS to MAX_DMA_CHANNELS

Signed-off-by Nobuhiro Iwamatsu <[email protected]>

---
 arch/sh/include/asm/dma-sh.h |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

arch/sh/include/asm/dma-sh.h +9 -8

index e873eca..0c8f8e1 100644
@@ -11,6 +11,7 @@
 #ifndef __DMA_SH_H
 #define __DMA_SH_H
 
+#include <asm/dma.h>
 #include <cpu/dma.h>
 
 /* DMAOR contorl: The DMAOR access size is different by CPU.*/

@@ -29,21 +30,21 @@
 #endif
 
 static int dmte_irq_map[] __maybe_unused = {
-#if (CONFIG_NR_ONCHIP_DMA_CHANNELS >= 4)
+#if (MAX_DMA_CHANNELS >= 4)
     DMTE0_IRQ,
     DMTE0_IRQ + 1,
     DMTE0_IRQ + 2,
     DMTE0_IRQ + 3,
 #endif
-#if (CONFIG_NR_ONCHIP_DMA_CHANNELS >= 6)
+#if (MAX_DMA_CHANNELS >= 6)
     DMTE4_IRQ,
     DMTE4_IRQ + 1,
 #endif
-#if (CONFIG_NR_ONCHIP_DMA_CHANNELS >= 8)
+#if (MAX_DMA_CHANNELS >= 8)
     DMTE6_IRQ,
     DMTE6_IRQ + 1,
 #endif
-#if (CONFIG_NR_ONCHIP_DMA_CHANNELS >= 12)
+#if (MAX_DMA_CHANNELS >= 12)
     DMTE8_IRQ,
     DMTE9_IRQ,
     DMTE10_IRQ,

@@ -85,21 +86,21 @@ static int dmte_irq_map[] __maybe_unused = {
 
 /* DMA base address */
 static u32 dma_base_addr[] __maybe_unused = {
-#if (CONFIG_NR_ONCHIP_DMA_CHANNELS >= 4)
+#if (MAX_DMA_CHANNELS >= 4)
 	SH_DMAC_BASE0 + 0x00,	/* channel 0 */
 	SH_DMAC_BASE0 + 0x10,
 	SH_DMAC_BASE0 + 0x20,
 	SH_DMAC_BASE0 + 0x30,
 #endif
-#if (CONFIG_NR_ONCHIP_DMA_CHANNELS >= 6)
+#if (MAX_DMA_CHANNELS >= 6)
 	SH_DMAC_BASE0 + 0x50,
 	SH_DMAC_BASE0 + 0x60,
 #endif
-#if (CONFIG_NR_ONCHIP_DMA_CHANNELS >= 8)
+#if (MAX_DMA_CHANNELS >= 8)
 	SH_DMAC_BASE1 + 0x00,
 	SH_DMAC_BASE1 + 0x10,
 #endif
-#if (CONFIG_NR_ONCHIP_DMA_CHANNELS >= 12)
+#if (MAX_DMA_CHANNELS >= 12)
 	SH_DMAC_BASE1 + 0x20,
 	SH_DMAC_BASE1 + 0x30,
 	SH_DMAC_BASE1 + 0x50,

Signature · 1 line

1.6.2

Paul Mundt

2009-03-16 10:59 UTC #1 lore raw

Quoted 4 lines · Nobuhiro Iwamatsu

Signed-off-by Nobuhiro Iwamatsu <[email protected]>
---
 arch/sh/include/asm/dma-sh.h |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

Quoted 5 lines · Nobuhiro Iwamatsu

get_dma_error_irq() used in dma-sh is function for exclusive use of SH4. SH3 doesn't have DMA Error interrupt.
This fixes it to compile it only in SH4.
Signed-off-by Nobuhiro Iwamatsu <[email protected]>

Quoted 7 lines · Nobuhiro Iwamatsu

-- log --
arch/sh/kernel/cpu/sh4/../sh3/entry.S:365: Error: invalid operands for opcode make[4]: *** [arch/sh/kernel/cpu/sh4/../sh3/entry.o] Error 1 make[3]: *** [arch/sh/kernel/cpu/sh4] Error 2
-- log --
Signed-off-by Nobuhiro Iwamatsu <[email protected]>

All applied, thanks.