From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751785Ab1CPCiI (ORCPT ); Tue, 15 Mar 2011 22:38:08 -0400 Received: from mga11.intel.com ([192.55.52.93]:54088 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751247Ab1CPCiE (ORCPT ); Tue, 15 Mar 2011 22:38:04 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.63,191,1299484800"; d="scan'208";a="897683305" Subject: Re: [PATCH repost 4/4] avr32: at32ap700x: specify DMA src and dst masters From: "Koul, Vinod" To: Jamie Iles Cc: Hans-Christian Egtvedt , "linux-kernel@vger.kernel.org" , "Williams, Dan J" , "nicolas.ferre@atmel.com" In-Reply-To: <20110315145652.GI2914@pulham.picochip.com> References: <1295619115-18420-1-git-send-email-jamie@jamieiles.com> <1295619115-18420-5-git-send-email-jamie@jamieiles.com> <1298295901.24505.68.camel@hcegtvedt> <20110221144539.GD2744@pulham.picochip.com> <20110315145652.GI2914@pulham.picochip.com> Content-Type: text/plain; charset="UTF-8" Date: Wed, 16 Mar 2011 07:38:16 +0530 Message-ID: <1300241296.19661.7.camel@vkoul-udesk3> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > > 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 > > Cc: Dan Williams > > Signed-off-by: Jamie Iles > > --- > > 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 Dan, please put this into you next queue as well -- ~Vinod