shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

dma pl330: modify dma test

Browse Source
This commit is contained in:
hhb
2012-08-31 21:21:54 +08:00
parent 988c4bca67
commit 137fbd10e0
3 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
arch/arm/mach-rk30/devices.c
View File

@@ -87,6 +87,7 @@ static struct resource resource_dmac1[] = {
.flags = IORESOURCE_IRQ,
},
};
#if defined(CONFIG_ARCH_RK3066B)
static struct rk29_pl330_platdata dmac1_pdata = {
.peri = {
@@ -94,13 +95,13 @@ static struct rk29_pl330_platdata dmac1_pdata = {
[1] = DMACH_UART0_RX,
[2] = DMACH_UART1_TX,
[3] = DMACH_UART1_RX,
[4] = DMACH_I2S0_8CH_TX,
[5] = DMACH_I2S0_8CH_RX,
[4] = DMACH_MAX,
[5] = DMACH_MAX,
[6] = DMACH_I2S1_2CH_TX,
[7] = DMACH_I2S1_2CH_RX,
[8] = DMACH_SPDIF_TX,
[9] = DMACH_I2S2_2CH_TX,
[10] = DMACH_I2S2_2CH_RX,
[9] = DMACH_DMAC0_MEMTOMEM,
[10] = DMACH_MAX,
[11] = DMACH_MAX,
[12] = DMACH_MAX,
[13] = DMACH_MAX,
@@ -125,6 +126,47 @@ static struct rk29_pl330_platdata dmac1_pdata = {
},
};
#else
static struct rk29_pl330_platdata dmac1_pdata = {
.peri = {
[0] = DMACH_UART0_TX,
[1] = DMACH_UART0_RX,
[2] = DMACH_UART1_TX,
[3] = DMACH_UART1_RX,
[4] = DMACH_I2S0_8CH_TX,
[5] = DMACH_I2S0_8CH_RX,
[6] = DMACH_I2S1_2CH_TX,
[7] = DMACH_I2S1_2CH_RX,
[8] = DMACH_SPDIF_TX,
[9] = DMACH_I2S2_2CH_TX,
[10] = DMACH_I2S2_2CH_RX,
[11] = DMACH_DMAC0_MEMTOMEM,
[12] = DMACH_MAX,
[13] = DMACH_MAX,
[14] = DMACH_MAX,
[15] = DMACH_MAX,
[16] = DMACH_MAX,
[17] = DMACH_MAX,
[18] = DMACH_MAX,
[19] = DMACH_MAX,
[20] = DMACH_MAX,
[21] = DMACH_MAX,
[22] = DMACH_MAX,
[23] = DMACH_MAX,
[24] = DMACH_MAX,
[25] = DMACH_MAX,
[26] = DMACH_MAX,
[27] = DMACH_MAX,
[28] = DMACH_MAX,
[29] = DMACH_MAX,
[30] = DMACH_MAX,
[31] = DMACH_MAX,
},
};
#endif
static struct platform_device device_dmac1 = {
.name = "rk29-pl330",
.id = 1,
@@ -166,7 +208,7 @@ static struct rk29_pl330_platdata dmac2_pdata = {
[11] = DMACH_SPI0_RX,
[12] = DMACH_SPI1_TX,
[13] = DMACH_SPI1_RX,
[14] = DMACH_DMAC2_MEMTOMEM,
[14] = DMACH_DMAC1_MEMTOMEM,
[15] = DMACH_MAX,
[16] = DMACH_MAX,
[17] = DMACH_MAX,

2
arch/arm/plat-rk/dma_memcpy_test.c
View File

@@ -63,7 +63,7 @@ static int interval = 1000;
module_param(interval,int,S_IRUGO|S_IWUSR);
#define DMA_THREAD 1
#define DMA_THREAD 2
#define MEMCPY_DMA_DBG(fmt...) {if(debug > 0) printk(fmt);}
static struct Dma_MemToMem DmaMemInfo0;

6
arch/arm/plat-rk/include/plat/dma-pl330.h
View File

@@ -92,8 +92,14 @@ enum dma_ch {
DMACH_SPI0_RX,
DMACH_SPI1_TX,
DMACH_SPI1_RX,
DMACH_DMAC0_MEMTOMEM,
DMACH_DMAC1_MEMTOMEM,
DMACH_DMAC2_MEMTOMEM,
DMACH_DMAC3_MEMTOMEM,
DMACH_DMAC4_MEMTOMEM,
DMACH_DMAC5_MEMTOMEM,
DMACH_DMAC6_MEMTOMEM,
DMACH_DMAC7_MEMTOMEM,
/* END Marker, also used to denote a reserved channel */
DMACH_MAX,
};