From patchwork Mon Feb 1 17:29:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 8181911 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 11CC09F1C0 for ; Mon, 1 Feb 2016 17:31:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4C453203B1 for ; Mon, 1 Feb 2016 17:31:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69808203B0 for ; Mon, 1 Feb 2016 17:31:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753587AbcBAR31 (ORCPT ); Mon, 1 Feb 2016 12:29:27 -0500 Received: from mail-wm0-f53.google.com ([74.125.82.53]:34902 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754182AbcBAR3Y (ORCPT ); Mon, 1 Feb 2016 12:29:24 -0500 Received: by mail-wm0-f53.google.com with SMTP id r129so81620141wmr.0 for ; Mon, 01 Feb 2016 09:29:23 -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=xo7m02gOMYXgZb55p1Nk1o7wMAY7mn+WjMj6l5pXGD4=; b=IY6gqebQpxwWZBQUeMLQJAwt6Nke+9smAT7cR0v8u1OrhsJXNII0QulTF6xqCcV0M1 BEuRCeEhHjPSPo92p/BB/HK9YtQHx5UuEBLBkErZccTI48AA4s7WIZjAsRjYfk7SuZ18 H0vk9oa9nFEydZqLrPOBc3j/V9Cd4JMPapYIQ= 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=xo7m02gOMYXgZb55p1Nk1o7wMAY7mn+WjMj6l5pXGD4=; b=bRfwNmNepbG/+EAeiI/S+U6ZXCVglcnGFzv93K/ePs7543TSTgKSZKyEpSIrgLJcSB m2DwbVnk6AxtELnh5027ebsj2jpwxvdb5Dac4Zvba01l7YgWInqs/HiFEPOOEYk0FdRT Ns7bS6QuddZH4uoyGBxVBhKnB3LTKJHVn4nLRBoS/8yP2zF4RdSSm8SWDSIbgHgv7l4j iMQIgRI8WgrEuKYrzWfMM/UFN1yxP9TE5O8R4uSzHeO98r9GJT0ObHgdXxRSah8nsILs b+4BR61XE6VnH85PTIZLjfEUJh7TH65QBF0QUxNlb+jUd/WtYg2uBwX3sqJ0dbMS41VU U5Xg== X-Gm-Message-State: AG10YOTaj+ODxgXDynSGpMaAAS36CCgPA9SWe+tuVrMXyEart2IqOwQ+WEuN/8iKUiulRzCb X-Received: by 10.194.235.4 with SMTP id ui4mr23054437wjc.177.1454347763125; Mon, 01 Feb 2016 09:29:23 -0800 (PST) Received: from localhost.localdomain (host-92-13-246-184.as43234.net. [92.13.246.184]) by smtp.gmail.com with ESMTPSA id l2sm30214750wjf.15.2016.02.01.09.29.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Feb 2016 09:29:22 -0800 (PST) From: Srinivas Kandagatla To: Patrick Lai , alsa-devel@alsa-project.org Cc: Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH RFC 10/15] ASoC: qcom: apq8016: add wrdma support Date: Mon, 1 Feb 2016 17:29:20 +0000 Message-Id: <1454347760-10856-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1454347622-9970-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1454347622-9970-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- sound/soc/qcom/lpass-apq8016.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c index df44f09..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); @@ -213,7 +225,11 @@ static struct lpass_variant apq8016_data = { .rdma_reg_base = 0x8400, .rdma_reg_stride = 0x1000, .rdma_channels = 2, - .rdmactl_audif_start = 1, + .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,