ARM/dmaengine: pl08x: pass reasonable memcpy settings

[sfrench/cifs-2.6.git] / arch / arm / mach-spear / spear6xx.c

diff --git a/arch/arm/mach-spear/spear6xx.c b/arch/arm/mach-spear/spear6xx.c
index ccf3573b831c47be90a207f8190aeb2bd85363d7..c5fc110134ba66950664f7e17d0940a947047adc 100644 (file)
--- a/arch/arm/mach-spear/spear6xx.c
+++ b/arch/arm/mach-spear/spear6xx.c
@@ -322,16 +322,10 @@ static struct pl08x_channel_data spear600_dma_info[] = {
 };
 
 static struct pl08x_platform_data spear6xx_pl080_plat_data = {
-       .memcpy_channel = {
-               .bus_id = "memcpy",
-               .cctl_memcpy =
-                       (PL080_BSIZE_16 << PL080_CONTROL_SB_SIZE_SHIFT | \
-                       PL080_BSIZE_16 << PL080_CONTROL_DB_SIZE_SHIFT | \
-                       PL080_WIDTH_32BIT << PL080_CONTROL_SWIDTH_SHIFT | \
-                       PL080_WIDTH_32BIT << PL080_CONTROL_DWIDTH_SHIFT | \
-                       PL080_CONTROL_PROT_BUFF | PL080_CONTROL_PROT_CACHE | \
-                       PL080_CONTROL_PROT_SYS),
-       },
+       .memcpy_burst_size = PL08X_BURST_SZ_16,
+       .memcpy_bus_width = PL08X_BUS_WIDTH_32_BITS,
+       .memcpy_prot_buff = true,
+       .memcpy_prot_cache = true,
        .lli_buses = PL08X_AHB1,
        .mem_buses = PL08X_AHB1,
        .get_xfer_signal = pl080_get_signal,