Re: [PATCH repost 4/4] avr32: at32ap700x: specify DMA src and dstmasters
From: Koul, Vinod
Date: Tue Mar 15 2011 - 22:38:13 EST
On Tue, 2011-03-15 at 20:26 +0530, Jamie Iles wrote:
> On Mon, Feb 21, 2011 at 02:45:40PM +0000, Jamie Iles wrote:
> > On Mon, Feb 21, 2011 at 02:45:00PM +0100, Hans-Christian Egtvedt wrote:
> > > Spotted by Nicolas Ferre, you use the wrong struct here, should be
> > > tx_dws, not rx_dws.
> >
> > Apologies, here's a patch to fix it up.
>
> Is anyone able to take this for the next merge?
>
> Jamie
>
> >
> > Jamie
> >
> > 8<--------
> >
> > From 9068d500450ad6f5189b9a71463851349700c505 Mon Sep 17 00:00:00 2001
> > From: Jamie Iles <jamie@xxxxxxxxxxxxx>
> > Date: Mon, 21 Feb 2011 14:38:32 +0000
> > Subject: [PATCH] avr32: at32ap700x: fix typo in DMA master configuration
> >
> > 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@xxxxxxxxx>
> > Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
> > Signed-off-by: Jamie Iles <jamie@xxxxxxxxxxxxx>
> > ---
> > arch/avr32/mach-at32ap/at32ap700x.c | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
> > index 2747cde..4635c7c 100644
> > --- a/arch/avr32/mach-at32ap/at32ap700x.c
> > +++ b/arch/avr32/mach-at32ap/at32ap700x.c
> > @@ -2058,8 +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;
> > + tx_dws->src_master = 0;
> > + tx_dws->dst_master = 1;
> > }
> >
> > if (platform_device_add_data(pdev, data,
> > --
> > 1.7.4
> >
Looks good to me,
Acked-By: Vinod Koul <vinod.koul@xxxxxxxxx>
Dan, please put this into you next queue as well
--
~Vinod
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/