Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4aa5f366 authored by Jamie Iles's avatar Jamie Iles Committed by Dan Williams
Browse files

avr32: at32ap700x: specify DMA src and dst masters 



Now that the dw_dmac DMA driver supports configurable source and
destination masters we need to specify which ones to use. This was
previously hardcoded to 0 and 1 respectively in the driver.

Acked-by: default avatarHans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 95ea759e

arch/avr32/mach-at32ap/at32ap700x.c

+6 −0
Original line number Diff line number Diff line
@@ -2048,6 +2048,8 @@ at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data, 
		rx_dws->reg_width = DW_DMA_SLAVE_WIDTH_16BIT;

		rx_dws->cfg_hi = DWC_CFGH_SRC_PER(3);

		rx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);

		rx_dws->src_master = 0;

		rx_dws->dst_master = 1;

	}



	/* Check if DMA slave interface for playback should be configured. */
@@ -2056,6 +2058,8 @@ at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data, 
		tx_dws->reg_width = DW_DMA_SLAVE_WIDTH_16BIT;

		tx_dws->cfg_hi = DWC_CFGH_DST_PER(4);

		tx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);

		rx_dws->src_master = 0;

		rx_dws->dst_master = 1;

	}



	if (platform_device_add_data(pdev, data,
@@ -2128,6 +2132,8 @@ at32_add_device_abdac(unsigned int id, struct atmel_abdac_pdata *data) 
	dws->reg_width = DW_DMA_SLAVE_WIDTH_32BIT;

	dws->cfg_hi = DWC_CFGH_DST_PER(2);

	dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);

	dws->src_master = 0;

	dws->dst_master = 1;



	if (platform_device_add_data(pdev, data,

				sizeof(struct atmel_abdac_pdata)))