Skip to content

L
linux
Commit 8742e044 authored by Thomas Abraham's avatar Thomas Abraham Committed by Kukjin Kim
Browse files
Options

ARM: S5PV210: Modify platform data for pl330 driver 

With the 'struct dma_pl330_peri' removed, the platfrom data for dma
driver can be simplified to a simple list of peripheral request ids.

Cc: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: default avatarBoojin Kim <boojin.kim@samsung.com>
Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 7c4cab7f
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 172 deletions
arch/arm/mach-s5pv210/dma.c
View file @ 8742e044
...@@ -35,90 +35,40 @@ ...@@ -35,90 +35,40 @@
static u64 dma_dmamask = DMA_BIT_MASK(32); static u64 dma_dmamask = DMA_BIT_MASK(32);
struct dma_pl330_peri pdma0_peri[28] = { u8 pdma0_peri[] = {
{ DMACH_UART0_RX,
.peri_id = (u8)DMACH_UART0_RX, DMACH_UART0_TX,
.rqtype = DEVTOMEM, DMACH_UART1_RX,
}, { DMACH_UART1_TX,
.peri_id = (u8)DMACH_UART0_TX, DMACH_UART2_RX,
.rqtype = MEMTODEV, DMACH_UART2_TX,
}, { DMACH_UART3_RX,
.peri_id = (u8)DMACH_UART1_RX, DMACH_UART3_TX,
.rqtype = DEVTOMEM, DMACH_MAX,
}, { DMACH_I2S0_RX,
.peri_id = (u8)DMACH_UART1_TX, DMACH_I2S0_TX,
.rqtype = MEMTODEV, DMACH_I2S0S_TX,
}, { DMACH_I2S1_RX,
.peri_id = (u8)DMACH_UART2_RX, DMACH_I2S1_TX,
.rqtype = DEVTOMEM, DMACH_MAX,
}, { DMACH_MAX,
.peri_id = (u8)DMACH_UART2_TX, DMACH_SPI0_RX,
.rqtype = MEMTODEV, DMACH_SPI0_TX,
}, { DMACH_SPI1_RX,
.peri_id = (u8)DMACH_UART3_RX, DMACH_SPI1_TX,
.rqtype = DEVTOMEM, DMACH_MAX,
}, { DMACH_MAX,
.peri_id = (u8)DMACH_UART3_TX, DMACH_AC97_MICIN,
.rqtype = MEMTODEV, DMACH_AC97_PCMIN,
}, { DMACH_AC97_PCMOUT,
.peri_id = DMACH_MAX, DMACH_MAX,
}, { DMACH_PWM,
.peri_id = (u8)DMACH_I2S0_RX, DMACH_SPDIF,
.rqtype = DEVTOMEM,
}, {
.peri_id = (u8)DMACH_I2S0_TX,
.rqtype = MEMTODEV,
}, {
.peri_id = (u8)DMACH_I2S0S_TX,
.rqtype = MEMTODEV,
}, {
.peri_id = (u8)DMACH_I2S1_RX,
.rqtype = DEVTOMEM,
}, {
.peri_id = (u8)DMACH_I2S1_TX,
.rqtype = MEMTODEV,
}, {
.peri_id = (u8)DMACH_MAX,
}, {
.peri_id = (u8)DMACH_MAX,
}, {
.peri_id = (u8)DMACH_SPI0_RX,
.rqtype = DEVTOMEM,
}, {
.peri_id = (u8)DMACH_SPI0_TX,
.rqtype = MEMTODEV,
}, {
.peri_id = (u8)DMACH_SPI1_RX,
.rqtype = DEVTOMEM,
}, {
.peri_id = (u8)DMACH_SPI1_TX,
.rqtype = MEMTODEV,
}, {
.peri_id = (u8)DMACH_MAX,
}, {
.peri_id = (u8)DMACH_MAX,
}, {
.peri_id = (u8)DMACH_AC97_MICIN,
.rqtype = DEVTOMEM,
}, {
.peri_id = (u8)DMACH_AC97_PCMIN,
.rqtype = DEVTOMEM,
}, {
.peri_id = (u8)DMACH_AC97_PCMOUT,
.rqtype = MEMTODEV,
}, {
.peri_id = (u8)DMACH_MAX,
}, {
.peri_id = (u8)DMACH_PWM,
}, {
.peri_id = (u8)DMACH_SPDIF,
.rqtype = MEMTODEV,
},
}; };
struct dma_pl330_platdata s5pv210_pdma0_pdata = { struct dma_pl330_platdata s5pv210_pdma0_pdata = {
.nr_valid_peri = ARRAY_SIZE(pdma0_peri), .nr_valid_peri = ARRAY_SIZE(pdma0_peri),
.peri = pdma0_peri, .peri_id = pdma0_peri,
}; };
struct amba_device s5pv210_device_pdma0 = { struct amba_device s5pv210_device_pdma0 = {
...@@ -137,102 +87,44 @@ struct amba_device s5pv210_device_pdma0 = { ...@@ -137,102 +87,44 @@ struct amba_device s5pv210_device_pdma0 = {
.periphid = 0x00041330, .periphid = 0x00041330,
}; };
struct dma_pl330_peri pdma1_peri[32] = { u8 pdma1_peri[] = {
{ DMACH_UART0_RX,
.peri_id = (u8)DMACH_UART0_RX, DMACH_UART0_TX,
.rqtype = DEVTOMEM, DMACH_UART1_RX,
}, { DMACH_UART1_TX,
.peri_id = (u8)DMACH_UART0_TX, DMACH_UART2_RX,
.rqtype = MEMTODEV, DMACH_UART2_TX,
}, { DMACH_UART3_RX,
.peri_id = (u8)DMACH_UART1_RX, DMACH_UART3_TX,
.rqtype = DEVTOMEM, DMACH_MAX,
}, { DMACH_I2S0_RX,
.peri_id = (u8)DMACH_UART1_TX, DMACH_I2S0_TX,
.rqtype = MEMTODEV, DMACH_I2S0S_TX,
}, { DMACH_I2S1_RX,
.peri_id = (u8)DMACH_UART2_RX, DMACH_I2S1_TX,
.rqtype = DEVTOMEM, DMACH_I2S2_RX,
}, { DMACH_I2S2_TX,
.peri_id = (u8)DMACH_UART2_TX, DMACH_SPI0_RX,
.rqtype = MEMTODEV, DMACH_SPI0_TX,
}, { DMACH_SPI1_RX,
.peri_id = (u8)DMACH_UART3_RX, DMACH_SPI1_TX,
.rqtype = DEVTOMEM, DMACH_MAX,
}, { DMACH_MAX,
.peri_id = (u8)DMACH_UART3_TX, DMACH_PCM0_RX,
.rqtype = MEMTODEV, DMACH_PCM0_TX,
}, { DMACH_PCM1_RX,
.peri_id = DMACH_MAX, DMACH_PCM1_TX,
}, { DMACH_MSM_REQ0,
.peri_id = (u8)DMACH_I2S0_RX, DMACH_MSM_REQ1,
.rqtype = DEVTOMEM, DMACH_MSM_REQ2,
}, { DMACH_MSM_REQ3,
.peri_id = (u8)DMACH_I2S0_TX, DMACH_PCM2_RX,
.rqtype = MEMTODEV, DMACH_PCM2_TX,
}, {
.peri_id = (u8)DMACH_I2S0S_TX,
.rqtype = MEMTODEV,
}, {
.peri_id = (u8)DMACH_I2S1_RX,
.rqtype = DEVTOMEM,
}, {
.peri_id = (u8)DMACH_I2S1_TX,
.rqtype = MEMTODEV,
}, {
.peri_id = (u8)DMACH_I2S2_RX,
.rqtype = DEVTOMEM,
}, {
.peri_id = (u8)DMACH_I2S2_TX,
.rqtype = MEMTODEV,
}, {
.peri_id = (u8)DMACH_SPI0_RX,
.rqtype = DEVTOMEM,
}, {
.peri_id = (u8)DMACH_SPI0_TX,
.rqtype = MEMTODEV,
}, {
.peri_id = (u8)DMACH_SPI1_RX,
.rqtype = DEVTOMEM,
}, {
.peri_id = (u8)DMACH_SPI1_TX,
.rqtype = MEMTODEV,
}, {
.peri_id = (u8)DMACH_MAX,
}, {
.peri_id = (u8)DMACH_MAX,
}, {
.peri_id = (u8)DMACH_PCM0_RX,
.rqtype = DEVTOMEM,
}, {
.peri_id = (u8)DMACH_PCM0_TX,
.rqtype = MEMTODEV,
}, {
.peri_id = (u8)DMACH_PCM1_RX,
.rqtype = DEVTOMEM,
}, {
.peri_id = (u8)DMACH_PCM1_TX,
.rqtype = MEMTODEV,
}, {
.peri_id = (u8)DMACH_MSM_REQ0,
}, {
.peri_id = (u8)DMACH_MSM_REQ1,
}, {
.peri_id = (u8)DMACH_MSM_REQ2,
}, {
.peri_id = (u8)DMACH_MSM_REQ3,
}, {
.peri_id = (u8)DMACH_PCM2_RX,
.rqtype = DEVTOMEM,
}, {
.peri_id = (u8)DMACH_PCM2_TX,
.rqtype = MEMTODEV,
},
}; };
struct dma_pl330_platdata s5pv210_pdma1_pdata = { struct dma_pl330_platdata s5pv210_pdma1_pdata = {
.nr_valid_peri = ARRAY_SIZE(pdma1_peri), .nr_valid_peri = ARRAY_SIZE(pdma1_peri),
.peri = pdma1_peri, .peri_id = pdma1_peri,
}; };
struct amba_device s5pv210_device_pdma1 = { struct amba_device s5pv210_device_pdma1 = {
...@@ -253,7 +145,12 @@ struct amba_device s5pv210_device_pdma1 = { ...@@ -253,7 +145,12 @@ struct amba_device s5pv210_device_pdma1 = {
static int __init s5pv210_dma_init(void) static int __init s5pv210_dma_init(void)
{ {
dma_cap_set(DMA_SLAVE, s5pv210_pdma0_pdata.cap_mask);
dma_cap_set(DMA_CYCLIC, s5pv210_pdma0_pdata.cap_mask);
amba_device_register(&s5pv210_device_pdma0, &iomem_resource); amba_device_register(&s5pv210_device_pdma0, &iomem_resource);
dma_cap_set(DMA_SLAVE, s5pv210_pdma1_pdata.cap_mask);
dma_cap_set(DMA_CYCLIC, s5pv210_pdma1_pdata.cap_mask);
amba_device_register(&s5pv210_device_pdma1, &iomem_resource); amba_device_register(&s5pv210_device_pdma1, &iomem_resource);
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7