]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
avr32: at32ap700x: fix typo in DMA master configuration
authorJamie Iles <jamie@jamieiles.com>
Tue, 22 Mar 2011 22:34:56 +0000 (15:34 -0700)
committerDan Williams <dan.j.williams@intel.com>
Tue, 22 Mar 2011 22:34:56 +0000 (15:34 -0700)
Commit 4aa5f366431fe (avr32: at32ap700x: specify DMA src and dst
masters) specified the masters for the ac97c playback device
but incorrectly set them in the capture slave information rather
than playback.

Cc: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Reported-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
[rebased on dmaengine for 2.6.39 (d42efe6b)]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
arch/avr32/mach-at32ap/at32ap700x.c

index b4aaebd8780c22563bbcb69ca7d95c3bdd87feb8..bfc9d071db9bce219985b62a5c80446ff7a1f3e5 100644 (file)
@@ -2061,8 +2061,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;
+               tx_dws->src_master = 0;
+               tx_dws->dst_master = 1;
                tx_dws->src_msize = DW_DMA_MSIZE_1;
                tx_dws->dst_msize = DW_DMA_MSIZE_1;
                tx_dws->fc = DW_DMA_FC_D_M2P;