[PATCH 3/3] ARM: EXYNOS4: Modify platform data for pl330 driver

2011-08-22 Thread Thomas Abraham 
With the 'struct dma_pl330_peri' removed, the platfrom data for dma
driver can be simplified to a simple list of peripheral request ids.

Signed-off-by: Thomas Abraham thomas.abra...@linaro.org
---
 arch/arm/mach-exynos4/dma.c |  220 ---
 1 files changed, 59 insertions(+), 161 deletions(-)

diff --git a/arch/arm/mach-exynos4/dma.c b/arch/arm/mach-exynos4/dma.c
index d57d662..f905114 100644
--- a/arch/arm/mach-exynos4/dma.c
+++ b/arch/arm/mach-exynos4/dma.c
@@ -35,95 +35,40 @@
 
 static u64 dma_dmamask = DMA_BIT_MASK(32);
 
-struct dma_pl330_peri pdma0_peri[28] = {
-   {
-   .peri_id = (u8)DMACH_PCM0_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_PCM0_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_PCM2_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_PCM2_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_MSM_REQ0,
-   }, {
-   .peri_id = (u8)DMACH_MSM_REQ2,
-   }, {
-   .peri_id = (u8)DMACH_SPI0_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_SPI0_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_SPI2_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_SPI2_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_I2S0S_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_I2S0_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_I2S0_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_UART0_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_UART0_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_UART2_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_UART2_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_UART4_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_UART4_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_SLIMBUS0_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_SLIMBUS0_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_SLIMBUS2_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_SLIMBUS2_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_SLIMBUS4_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_SLIMBUS4_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_AC97_MICIN,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_AC97_PCMIN,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_AC97_PCMOUT,
-   .rqtype = MEMTODEV,
-   },
+u8 pdma0_peri[] = {
+   DMACH_PCM0_RX,
+   DMACH_PCM0_TX,
+   DMACH_PCM2_RX,
+   DMACH_PCM2_TX,
+   DMACH_MSM_REQ0,
+   DMACH_MSM_REQ2,
+   DMACH_SPI0_RX,
+   DMACH_SPI0_TX,
+   DMACH_SPI2_RX,
+   DMACH_SPI2_TX,
+   DMACH_I2S0S_TX,
+   DMACH_I2S0_RX,
+   DMACH_I2S0_TX,
+   DMACH_UART0_RX,
+   DMACH_UART0_TX,
+   DMACH_UART2_RX,
+   DMACH_UART2_TX,
+   DMACH_UART4_RX,
+   DMACH_UART4_TX,
+   DMACH_SLIMBUS0_RX,
+   DMACH_SLIMBUS0_TX,
+   DMACH_SLIMBUS2_RX,
+   DMACH_SLIMBUS2_TX,
+   DMACH_SLIMBUS4_RX,
+   DMACH_SLIMBUS4_TX,
+   DMACH_AC97_MICIN,
+   DMACH_AC97_PCMIN,
+   DMACH_AC97_PCMOUT,
 };
 
 struct dma_pl330_platdata exynos4_pdma0_pdata = {
.nr_valid_peri = ARRAY_SIZE(pdma0_peri),
-   .peri = pdma0_peri,
+   .peri_id = pdma0_peri,
 };
 
 struct amba_device exynos4_device_pdma0 = {
@@ -142,86 +87,37 @@ struct amba_device exynos4_device_pdma0 = {
.periphid = 0x00041330,
 };
 
-struct dma_pl330_peri pdma1_peri[25] = {
-   {
-   .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_REQ1,
-   }, {
-   .peri_id = (u8)DMACH_MSM_REQ3,
-   }, {
-   .peri_id = (u8)DMACH_SPI1_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_SPI1_TX,
-   .rqtype =

[PATCH 3/3] ARM: EXYNOS4: Modify platform data for pl330 driver

2011-08-22 Thread Thomas Abraham 
With the 'struct dma_pl330_peri' removed, the platfrom data for dma
driver can be simplified to a simple list of peripheral request ids.

Signed-off-by: Thomas Abraham thomas.abra...@linaro.org
---
 arch/arm/mach-exynos4/dma.c |  220 ---
 1 files changed, 59 insertions(+), 161 deletions(-)

diff --git a/arch/arm/mach-exynos4/dma.c b/arch/arm/mach-exynos4/dma.c
index d57d662..f905114 100644
--- a/arch/arm/mach-exynos4/dma.c
+++ b/arch/arm/mach-exynos4/dma.c
@@ -35,95 +35,40 @@
 
 static u64 dma_dmamask = DMA_BIT_MASK(32);
 
-struct dma_pl330_peri pdma0_peri[28] = {
-   {
-   .peri_id = (u8)DMACH_PCM0_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_PCM0_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_PCM2_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_PCM2_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_MSM_REQ0,
-   }, {
-   .peri_id = (u8)DMACH_MSM_REQ2,
-   }, {
-   .peri_id = (u8)DMACH_SPI0_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_SPI0_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_SPI2_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_SPI2_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_I2S0S_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_I2S0_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_I2S0_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_UART0_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_UART0_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_UART2_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_UART2_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_UART4_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_UART4_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_SLIMBUS0_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_SLIMBUS0_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_SLIMBUS2_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_SLIMBUS2_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_SLIMBUS4_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_SLIMBUS4_TX,
-   .rqtype = MEMTODEV,
-   }, {
-   .peri_id = (u8)DMACH_AC97_MICIN,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_AC97_PCMIN,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_AC97_PCMOUT,
-   .rqtype = MEMTODEV,
-   },
+u8 pdma0_peri[] = {
+   DMACH_PCM0_RX,
+   DMACH_PCM0_TX,
+   DMACH_PCM2_RX,
+   DMACH_PCM2_TX,
+   DMACH_MSM_REQ0,
+   DMACH_MSM_REQ2,
+   DMACH_SPI0_RX,
+   DMACH_SPI0_TX,
+   DMACH_SPI2_RX,
+   DMACH_SPI2_TX,
+   DMACH_I2S0S_TX,
+   DMACH_I2S0_RX,
+   DMACH_I2S0_TX,
+   DMACH_UART0_RX,
+   DMACH_UART0_TX,
+   DMACH_UART2_RX,
+   DMACH_UART2_TX,
+   DMACH_UART4_RX,
+   DMACH_UART4_TX,
+   DMACH_SLIMBUS0_RX,
+   DMACH_SLIMBUS0_TX,
+   DMACH_SLIMBUS2_RX,
+   DMACH_SLIMBUS2_TX,
+   DMACH_SLIMBUS4_RX,
+   DMACH_SLIMBUS4_TX,
+   DMACH_AC97_MICIN,
+   DMACH_AC97_PCMIN,
+   DMACH_AC97_PCMOUT,
 };
 
 struct dma_pl330_platdata exynos4_pdma0_pdata = {
.nr_valid_peri = ARRAY_SIZE(pdma0_peri),
-   .peri = pdma0_peri,
+   .peri_id = pdma0_peri,
 };
 
 struct amba_device exynos4_device_pdma0 = {
@@ -142,86 +87,37 @@ struct amba_device exynos4_device_pdma0 = {
.periphid = 0x00041330,
 };
 
-struct dma_pl330_peri pdma1_peri[25] = {
-   {
-   .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_REQ1,
-   }, {
-   .peri_id = (u8)DMACH_MSM_REQ3,
-   }, {
-   .peri_id = (u8)DMACH_SPI1_RX,
-   .rqtype = DEVTOMEM,
-   }, {
-   .peri_id = (u8)DMACH_SPI1_TX,
-   .rqtype =