diff options
Diffstat (limited to 'arch/avr32/mach-at32ap/at32ap700x.c')
-rw-r--r-- | arch/avr32/mach-at32ap/at32ap700x.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index 889c544688c..0445c4fd67e 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/arch/avr32/mach-at32ap/at32ap700x.c | |||
@@ -1351,7 +1351,6 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data) | |||
1351 | goto fail; | 1351 | goto fail; |
1352 | 1352 | ||
1353 | slave->sdata.dma_dev = &dw_dmac0_device.dev; | 1353 | slave->sdata.dma_dev = &dw_dmac0_device.dev; |
1354 | slave->sdata.reg_width = DW_DMA_SLAVE_WIDTH_32BIT; | ||
1355 | slave->sdata.cfg_hi = (DWC_CFGH_SRC_PER(0) | 1354 | slave->sdata.cfg_hi = (DWC_CFGH_SRC_PER(0) |
1356 | | DWC_CFGH_DST_PER(1)); | 1355 | | DWC_CFGH_DST_PER(1)); |
1357 | slave->sdata.cfg_lo &= ~(DWC_CFGL_HS_DST_POL | 1356 | slave->sdata.cfg_lo &= ~(DWC_CFGL_HS_DST_POL |
@@ -2046,27 +2045,19 @@ at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data, | |||
2046 | /* Check if DMA slave interface for capture should be configured. */ | 2045 | /* Check if DMA slave interface for capture should be configured. */ |
2047 | if (flags & AC97C_CAPTURE) { | 2046 | if (flags & AC97C_CAPTURE) { |
2048 | rx_dws->dma_dev = &dw_dmac0_device.dev; | 2047 | rx_dws->dma_dev = &dw_dmac0_device.dev; |
2049 | rx_dws->reg_width = DW_DMA_SLAVE_WIDTH_16BIT; | ||
2050 | rx_dws->cfg_hi = DWC_CFGH_SRC_PER(3); | 2048 | rx_dws->cfg_hi = DWC_CFGH_SRC_PER(3); |
2051 | rx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL); | 2049 | rx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL); |
2052 | rx_dws->src_master = 0; | 2050 | rx_dws->src_master = 0; |
2053 | rx_dws->dst_master = 1; | 2051 | rx_dws->dst_master = 1; |
2054 | rx_dws->src_msize = DW_DMA_MSIZE_1; | ||
2055 | rx_dws->dst_msize = DW_DMA_MSIZE_1; | ||
2056 | rx_dws->fc = DW_DMA_FC_D_P2M; | ||
2057 | } | 2052 | } |
2058 | 2053 | ||
2059 | /* Check if DMA slave interface for playback should be configured. */ | 2054 | /* Check if DMA slave interface for playback should be configured. */ |
2060 | if (flags & AC97C_PLAYBACK) { | 2055 | if (flags & AC97C_PLAYBACK) { |
2061 | tx_dws->dma_dev = &dw_dmac0_device.dev; | 2056 | tx_dws->dma_dev = &dw_dmac0_device.dev; |
2062 | tx_dws->reg_width = DW_DMA_SLAVE_WIDTH_16BIT; | ||
2063 | tx_dws->cfg_hi = DWC_CFGH_DST_PER(4); | 2057 | tx_dws->cfg_hi = DWC_CFGH_DST_PER(4); |
2064 | tx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL); | 2058 | tx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL); |
2065 | tx_dws->src_master = 0; | 2059 | tx_dws->src_master = 0; |
2066 | tx_dws->dst_master = 1; | 2060 | tx_dws->dst_master = 1; |
2067 | tx_dws->src_msize = DW_DMA_MSIZE_1; | ||
2068 | tx_dws->dst_msize = DW_DMA_MSIZE_1; | ||
2069 | tx_dws->fc = DW_DMA_FC_D_M2P; | ||
2070 | } | 2061 | } |
2071 | 2062 | ||
2072 | if (platform_device_add_data(pdev, data, | 2063 | if (platform_device_add_data(pdev, data, |
@@ -2136,14 +2127,10 @@ at32_add_device_abdac(unsigned int id, struct atmel_abdac_pdata *data) | |||
2136 | dws = &data->dws; | 2127 | dws = &data->dws; |
2137 | 2128 | ||
2138 | dws->dma_dev = &dw_dmac0_device.dev; | 2129 | dws->dma_dev = &dw_dmac0_device.dev; |
2139 | dws->reg_width = DW_DMA_SLAVE_WIDTH_32BIT; | ||
2140 | dws->cfg_hi = DWC_CFGH_DST_PER(2); | 2130 | dws->cfg_hi = DWC_CFGH_DST_PER(2); |
2141 | dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL); | 2131 | dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL); |
2142 | dws->src_master = 0; | 2132 | dws->src_master = 0; |
2143 | dws->dst_master = 1; | 2133 | dws->dst_master = 1; |
2144 | dws->src_msize = DW_DMA_MSIZE_1; | ||
2145 | dws->dst_msize = DW_DMA_MSIZE_1; | ||
2146 | dws->fc = DW_DMA_FC_D_M2P; | ||
2147 | 2134 | ||
2148 | if (platform_device_add_data(pdev, data, | 2135 | if (platform_device_add_data(pdev, data, |
2149 | sizeof(struct atmel_abdac_pdata))) | 2136 | sizeof(struct atmel_abdac_pdata))) |