From patchwork Thu Feb 11 12:19:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 61753 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp155667lbl; Thu, 11 Feb 2016 04:19:39 -0800 (PST) X-Received: by 10.66.235.162 with SMTP id un2mr65366138pac.17.1455193179501; Thu, 11 Feb 2016 04:19:39 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rd7si12351104pab.90.2016.02.11.04.19.39; Thu, 11 Feb 2016 04:19:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753277AbcBKMTh (ORCPT + 30 others); Thu, 11 Feb 2016 07:19:37 -0500 Received: from mail-wm0-f42.google.com ([74.125.82.42]:32961 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751935AbcBKMTe (ORCPT ); Thu, 11 Feb 2016 07:19:34 -0500 Received: by mail-wm0-f42.google.com with SMTP id g62so18767534wme.0 for ; Thu, 11 Feb 2016 04:19:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WPMJKcsyz4d5CAqN8cDdx0g8lXvReCfB0vhUqqn/FAQ=; b=LXxRY0b6QRzwxgT8RDlCGmpT6anJ0LD98HFzyFbwdT0h3QV5zEBJj+ANBlJp8TmFfm 9J6BbLlVMH7yItkg8uYo3uHQh0quLF3IBCogMZzofNRBBe6VevMgn+TPvYGbsuKjtqFS 2SzwOvMHeZrPmNfxi/4UqFGvH2Z97N2wjewlY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WPMJKcsyz4d5CAqN8cDdx0g8lXvReCfB0vhUqqn/FAQ=; b=RjEbTs5c0jKf98QpVFlRh+Yhv9Cm5IlxklXHMTj3xaLjQyi9O8M9plxsJ8mnpT6FdH yf943phqJrO2YOgD6lB2l7HyQA/aeUb1OYu8fyYKSjZaUg0Cyiz3CndiflDfg0QtK53E j6BPDdYk4/XA1UGWaV0P/C5+zbS2GVvv4TzhYCGq8FE7gZGOVKu8GvllGkSNAps2ukfa F5aTCwkOhQZEnkdoohTqUnmV1rtXPqg37309PLGlCyNdOFq+v0iPJKZoEXnJcS2GA1Fw xK2asMeED7nMVmbVRq6jH2iatyowjt6SBw5QDgBNnDnETiPcortT2Pkly7wgzlvdQjGv dIBQ== X-Gm-Message-State: AG10YORP9UgdeuxVhmXQ9kcgtN0vr3il41t7CEWpbo0f0Pz+WtptFwjvp0+0SXkvyMbhUTQT X-Received: by 10.28.55.76 with SMTP id e73mr18016902wma.53.1455193173268; Thu, 11 Feb 2016 04:19:33 -0800 (PST) Received: from localhost.localdomain (host-92-13-246-184.as43234.net. [92.13.246.184]) by smtp.gmail.com with ESMTPSA id x65sm7766524wmg.4.2016.02.11.04.19.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Feb 2016 04:19:32 -0800 (PST) From: Srinivas Kandagatla To: Patrick Lai , alsa-devel@alsa-project.org, Mark Brown Cc: Banajit Goswami , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, kwestfie@codeaurora.org, Srinivas Kandagatla Subject: [PATCH v3 08/14] ASoC: qcom: apq8016: add wrdma support Date: Thu, 11 Feb 2016 12:19:30 +0000 Message-Id: <1455193170-2169-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455193007-1481-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1455193007-1481-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds wrdma support in lpass-apq8016 by providing the register offsets and adding support in dma channel allocation callback. Signed-off-by: Srinivas Kandagatla Acked-by: Kenneth Westfield --- sound/soc/qcom/lpass-apq8016.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) -- 1.9.1 diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c index ca3bbd5..3eef0c3 100644 --- a/sound/soc/qcom/lpass-apq8016.c +++ b/sound/soc/qcom/lpass-apq8016.c @@ -137,11 +137,23 @@ static int apq8016_lpass_alloc_dma_channel(struct lpass_data *drvdata, int direction) { struct lpass_variant *v = drvdata->variant; - int chan = find_first_zero_bit(&drvdata->dma_ch_bit_map, + int chan = 0; + + if (direction == SNDRV_PCM_STREAM_PLAYBACK) { + chan = find_first_zero_bit(&drvdata->dma_ch_bit_map, v->rdma_channels); - if (chan >= v->rdma_channels) - return -EBUSY; + if (chan >= v->rdma_channels) + return -EBUSY; + } else { + chan = find_next_zero_bit(&drvdata->dma_ch_bit_map, + v->wrdma_channel_start + + v->wrdma_channels, + v->wrdma_channel_start); + + if (chan >= v->wrdma_channel_start + v->wrdma_channels) + return -EBUSY; + } set_bit(chan, &drvdata->dma_ch_bit_map); @@ -214,6 +226,10 @@ static struct lpass_variant apq8016_data = { .rdma_reg_stride = 0x1000, .rdma_channels = 2, .dmactl_audif_start = 1, + .wrdma_reg_base = 0xB000, + .wrdma_reg_stride = 0x1000, + .wrdma_channel_start = 5, + .wrdma_channels = 2, .dai_driver = apq8016_lpass_cpu_dai_driver, .num_dai = ARRAY_SIZE(apq8016_lpass_cpu_dai_driver), .init = apq8016_lpass_init,