From patchwork Wed Feb 10 10:19:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 8269841 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 70EDA9F1C0 for ; Wed, 10 Feb 2016 10:24:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 949D62022A for ; Wed, 10 Feb 2016 10:24:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9006320145 for ; Wed, 10 Feb 2016 10:24:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757782AbcBJKWo (ORCPT ); Wed, 10 Feb 2016 05:22:44 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:37532 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757772AbcBJKTV (ORCPT ); Wed, 10 Feb 2016 05:19:21 -0500 Received: by mail-wm0-f52.google.com with SMTP id g62so19892103wme.0 for ; Wed, 10 Feb 2016 02:19:20 -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=65KGlg/AKV9sf5TmxU9y7KMuxCWErWAQCN+Lti7H3UY=; b=PNOcBBJHaUbJZP6z6Dl7/uFV79/cTQTJYl4TIlxfIGAX2a/BH7ljRGwe2T4duAoeo1 jfDIXazrSzI2VXkG3mDT3QO32SwbBFkAvHVwRYDXKkIEhYmdu6MAh3yNyBMdifYFnOXL DStm8Mcoijt1HyhuZfDQ6i4R4d5D7wWjTIdwQ= 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=65KGlg/AKV9sf5TmxU9y7KMuxCWErWAQCN+Lti7H3UY=; b=LfHuGuDHJG4ThTdRGfGpxJwd+6lSRSdm8HTbIgMGbm74nzS6h5lF+baejz8IvknEjM d7MTtVSO1XGlmEE6G7TSajP+1BKQ8KhLS3BE6xyTYvKuBUhdF2Lriw/9IBRDJRQtD8Fo SHfS8mUb//cG9WScE+Mv2mNrRpm7CeAZknGKQM2EhY3c6WSyuYmY6OKSd01kKZ0XCBso q7WRrxTzvU67oOnuLYh0mhWrfcf4w4vTz6HmhIvaCuZyW5pgAMIJPhKOu/Gd9SJ0w9VP YHF9mv85R5K3x/+cq47XCY9Bv5lYC1yWI4edeNSHGLHhByOg/7uerelmx8brr/Bm+lGf QwIg== X-Gm-Message-State: AG10YORf85VdFwJicwnuA50il4jWwDdDlHClsc+/BuroRpNKQtEytp/RAjhirUijjfFAmvEp X-Received: by 10.194.5.227 with SMTP id v3mr46778206wjv.59.1455099560128; Wed, 10 Feb 2016 02:19:20 -0800 (PST) Received: from localhost.localdomain (host-92-13-246-184.as43234.net. [92.13.246.184]) by smtp.gmail.com with ESMTPSA id cb2sm2268547wjc.16.2016.02.10.02.19.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Feb 2016 02:19:19 -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 v1 08/14] ASoC: qcom: apq8016: add wrdma support Date: Wed, 10 Feb 2016 10:19:17 +0000 Message-Id: <1455099557-665-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455099418-311-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1455099418-311-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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) 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,