From patchwork Tue May 24 18:50:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gardiner X-Patchwork-Id: 813232 Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4OIqSS7001900 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 24 May 2011 18:52:49 GMT Received: from dlep35.itg.ti.com ([157.170.170.118]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id p4OIpaBu014578 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 24 May 2011 13:51:36 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id p4OIpZRT028101; Tue, 24 May 2011 13:51:36 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 3216C8076E; Tue, 24 May 2011 13:51:11 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp53.itg.ti.com (dflp53.itg.ti.com [128.247.5.6]) by linux.omap.com (Postfix) with ESMTP id 1BA0780650 for ; Tue, 24 May 2011 13:50:30 -0500 (CDT) Received: from white.ext.ti.com (white.ext.ti.com [192.94.93.38]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id p4OIoPS8020726 for ; Tue, 24 May 2011 13:50:25 -0500 (CDT) Received: from psmtp.com (na3sys009amx234.postini.com [74.125.149.118]) by white.ext.ti.com (8.13.7/8.13.7) with SMTP id p4OIoOqr022775 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 24 May 2011 13:50:24 -0500 Received: from na3sys009aog117.obsmtp.com ([209.85.212.54]) (using TLSv1) by na3sys009amx234.postini.com ([74.125.148.10]) with SMTP; Tue, 24 May 2011 18:50:24 GMT Received: from mail-vw0-f54.google.com ([209.85.212.54]) (using TLSv1) by na3sys009aob117.postini.com ([74.125.148.12]) with SMTP ID DSNKTdv97zOTFuklHCMsGdRnsPNLAsBkjouN@postini.com; Tue, 24 May 2011 11:50:24 PDT Received: by mail-vw0-f54.google.com with SMTP id 18so7088410vws.13 for ; Tue, 24 May 2011 11:50:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nanometrics.ca; s=google; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=L6fWgxb/WxHWCcQaAhtstVQiSZX10Yp5rIyY2x53FD8=; b=bEpGq50KBPdeQfevrhd//n8899gsngT081/AWn+P/PhnbYjKMizHBchY3OGrACR4Xa KArUf0Pko2BL++rWwDoI6357WBsYQjBr7ekWGN5ADw7RIJUc47hxqmI38GG0s/ArAnMp XydZI4EaJX2TrnfniuAkUoQocstoulMUVrc8A= DomainKey-Signature: a=rsa-sha1; c=nofws; d=nanometrics.ca; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=YsY+hxjWeFzsX6UDJOzTun1zLp7CNXgAe9mvog8C4F1SJ35UxAFPSpNyrYuUtZ8Tpf KTuVk2lHj5wqThADWApLNDoWjONekjGI02wzom1feFZ3TQNYOLlQYHM87C1fJj1V5O5K Wa/H4qXim4M5yIgHpmjzKvZYfJsXe2Wotxkoo= Received: by 10.52.107.129 with SMTP id hc1mr1012422vdb.173.1306263023637; Tue, 24 May 2011 11:50:23 -0700 (PDT) Received: from localhost.localdomain ([206.191.47.130]) by mx.google.com with ESMTPS id d18sm1646004vcs.40.2011.05.24.11.50.22 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 May 2011 11:50:23 -0700 (PDT) From: Ben Gardiner To: Mark Brown , Sekhar Nori , Liam Girdwood , alsa-devel@alsa-project.org, davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH 1/6] ASoC: davinci-pcm: trivial: make ping-pong params setup symmetrical Date: Tue, 24 May 2011 14:50:15 -0400 Message-Id: X-Mailer: git-send-email 1.7.4.1 In-Reply-To: References: X-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-settings: 2 (0.5000:0.0750) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [db-null] Cc: Steven Faludi X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 24 May 2011 18:52:49 +0000 (UTC) The setup of the pong channel uses EDMA_CHAN_SLOT instead of & 0x3f as the setup of the ping channel does. Make the setup of ping and pong symmetric. There is no functional change introduced by this patch. Signed-off-by: Ben Gardiner Reviewed-by: Steven Faludi --- sound/soc/davinci/davinci-pcm.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index 9d35b8c..0d04e0c 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c @@ -425,7 +425,8 @@ static int request_ping_pong(struct snd_pcm_substream *substream, edma_read_slot(link, &prtd->asp_params); prtd->asp_params.opt &= ~(TCCMODE | EDMA_TCC(0x3f) | TCINTEN); - prtd->asp_params.opt |= TCCHEN | EDMA_TCC(prtd->ram_channel & 0x3f); + prtd->asp_params.opt |= TCCHEN | + EDMA_TCC(prtd->ram_channel & 0x3f); edma_write_slot(link, &prtd->asp_params); /* pong */ @@ -439,7 +440,7 @@ static int request_ping_pong(struct snd_pcm_substream *substream, prtd->asp_params.opt &= ~(TCCMODE | EDMA_TCC(0x3f)); /* interrupt after every pong completion */ prtd->asp_params.opt |= TCINTEN | TCCHEN | - EDMA_TCC(EDMA_CHAN_SLOT(prtd->ram_channel)); + EDMA_TCC(prtd->ram_channel & 0x3f); edma_write_slot(link, &prtd->asp_params); /* ram */