dmaengine: dw: rename masters to reflect actual topology

[deliverable/linux.git] / arch / avr32 / mach-at32ap / at32ap700x.c

diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index bf445aa482826920ebd0091c3b88d0a948e0ccae..00d6dcc1d9b664c68627d4ddf7742331f8f215f1 100644 (file)
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1365,8 +1365,8 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
        slave->dma_dev = &dw_dmac0_device.dev;
        slave->src_id = 0;
        slave->dst_id = 1;
-       slave->src_master = 1;
-       slave->dst_master = 0;
+       slave->m_master = 1;
+       slave->p_master = 0;
 
        data->dma_slave = slave;
        data->dma_filter = at32_mci_dma_filter;
@@ -2061,16 +2061,16 @@ at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data,
        if (flags & AC97C_CAPTURE) {
                rx_dws->dma_dev = &dw_dmac0_device.dev;
                rx_dws->src_id = 3;
-               rx_dws->src_master = 0;
-               rx_dws->dst_master = 1;
+               rx_dws->m_master = 0;
+               rx_dws->p_master = 1;
        }
 
        /* Check if DMA slave interface for playback should be configured. */
        if (flags & AC97C_PLAYBACK) {
                tx_dws->dma_dev = &dw_dmac0_device.dev;
                tx_dws->dst_id = 4;
-               tx_dws->src_master = 0;
-               tx_dws->dst_master = 1;
+               tx_dws->m_master = 0;
+               tx_dws->p_master = 1;
        }
 
        if (platform_device_add_data(pdev, data,
@@ -2141,8 +2141,8 @@ at32_add_device_abdac(unsigned int id, struct atmel_abdac_pdata *data)
 
        dws->dma_dev = &dw_dmac0_device.dev;
        dws->dst_id = 2;
-       dws->src_master = 0;
-       dws->dst_master = 1;
+       dws->m_master = 0;
+       dws->p_master = 1;
 
        if (platform_device_add_data(pdev, data,
                                sizeof(struct atmel_abdac_pdata)))