From patchwork Thu Feb 11 12:17: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: 61742 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp154760lbl; Thu, 11 Feb 2016 04:17:42 -0800 (PST) X-Received: by 10.66.149.7 with SMTP id tw7mr66428827pab.72.1455193062574; Thu, 11 Feb 2016 04:17:42 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p86si6739597pfa.161.2016.02.11.04.17.42; Thu, 11 Feb 2016 04:17:42 -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 S1752693AbcBKMRg (ORCPT + 30 others); Thu, 11 Feb 2016 07:17:36 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:38903 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752590AbcBKMRd (ORCPT ); Thu, 11 Feb 2016 07:17:33 -0500 Received: by mail-wm0-f45.google.com with SMTP id p63so65755795wmp.1 for ; Thu, 11 Feb 2016 04:17: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=YXpMDRTOQv4x/P7WxaakUbDbUVHBUurNMFBLCohtkOY=; b=DQMcXnghqea9oM8Fl1BtFvMKX0XnzR6WCDjfYUzvgO0VRReOFoBVU5sAObUFMtljou 6wnsPT6z3OJsgDz8oPcfdwPDgyWwZ9dTVk1HY0RI2iXAroPiouEgzYblXHX9LdK0PV1Z o9coL52JQsRDcDxCggw/i+IABa1Hz55fTxeTk= 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=YXpMDRTOQv4x/P7WxaakUbDbUVHBUurNMFBLCohtkOY=; b=CBuJ69PKl1oRW8GOvc4X8MvSdjpgxgPv3/v4UBQY45c+QFgmv8HQXTS35KZ3EhdKmV +v3PFM6I5mjTMOywivytELvH0xe9ZMj52sgvNmrd7bbCzzFeIXByhmMZhrqcgEEHNxtn nKYACQ2EP/LZZwX0wiChAEQJhTwNR7NQMzj5HBvOIU0wrKPyl97/s++dyVl94R4I/f9S kqQ8BmNCVImX4HbmtYFU+9jKcJVcI/nWJyMI8S/H9HHKffMs+woiKpgdJwqmwhuy1Umq nZfKQaYpOz13L6wfAHBUzPG1vyYwk1ekAd/Bo5pg3SlQoagmLAzcdG0HRbY7NIeMRDO+ tskQ== X-Gm-Message-State: AG10YOQUgIixHgjo42aRjNkU1H7cy9m9rMOHfgvpF1KyyVgLl5FiAmI2l7uUjIeOtuq9lVQd X-Received: by 10.194.240.66 with SMTP id vy2mr46108337wjc.28.1455193052613; Thu, 11 Feb 2016 04:17:32 -0800 (PST) Received: from localhost.localdomain (host-92-13-246-184.as43234.net. [92.13.246.184]) by smtp.gmail.com with ESMTPSA id az10sm7337942wjc.28.2016.02.11.04.17.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Feb 2016 04:17: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 03/14] ASoC: qcom: rename rdmactl_audif_start to dmactrl_audif_start Date: Thu, 11 Feb 2016 12:17:30 +0000 Message-Id: <1455193050-1620-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 renames rdmactl_audif_start to dmactrl_audif_start as this is common for both rdma and wrdma. Without this patch the name would be bit misleading to the readers. Signed-off-by: Srinivas Kandagatla Acked-by: Kenneth Westfield --- sound/soc/qcom/lpass-apq8016.c | 2 +- sound/soc/qcom/lpass-platform.c | 4 ++-- sound/soc/qcom/lpass.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -- 1.9.1 diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c index 94efc01..6cc7e72 100644 --- a/sound/soc/qcom/lpass-apq8016.c +++ b/sound/soc/qcom/lpass-apq8016.c @@ -212,7 +212,7 @@ 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, .dai_driver = apq8016_lpass_cpu_dai_driver, .num_dai = ARRAY_SIZE(apq8016_lpass_cpu_dai_driver), .init = apq8016_lpass_init, diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c index ec2414d..7245c2e 100644 --- a/sound/soc/qcom/lpass-platform.c +++ b/sound/soc/qcom/lpass-platform.c @@ -91,7 +91,7 @@ static int lpass_platform_pcmops_hw_params(struct snd_pcm_substream *substream, unsigned int channels = params_channels(params); unsigned int regval; int bitwidth; - int ret, rdma_port = pcm_data->i2s_port + v->rdmactl_audif_start; + int ret, dma_port = pcm_data->i2s_port + v->dmactl_audif_start; bitwidth = snd_pcm_format_width(format); if (bitwidth < 0) { @@ -101,7 +101,7 @@ static int lpass_platform_pcmops_hw_params(struct snd_pcm_substream *substream, } regval = LPAIF_RDMACTL_BURSTEN_INCR4 | - LPAIF_RDMACTL_AUDINTF(rdma_port) | + LPAIF_RDMACTL_AUDINTF(dma_port) | LPAIF_RDMACTL_FIFOWM_8; switch (bitwidth) { diff --git a/sound/soc/qcom/lpass.h b/sound/soc/qcom/lpass.h index 024a771..412399a 100644 --- a/sound/soc/qcom/lpass.h +++ b/sound/soc/qcom/lpass.h @@ -79,7 +79,7 @@ struct lpass_variant { * on SOCs like APQ8016 the channel control bits start * at different offset to ipq806x **/ - u32 rdmactl_audif_start; + u32 dmactl_audif_start; u32 wrdma_channel_start; /* SOC specific intialization like clocks */ int (*init)(struct platform_device *pdev);