From patchwork Wed Feb 10 10:18:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 61623 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2552295lbl; Wed, 10 Feb 2016 02:18:42 -0800 (PST) X-Received: by 10.98.70.139 with SMTP id o11mr57163671pfi.123.1455099522572; Wed, 10 Feb 2016 02:18:42 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q190si4152857pfq.247.2016.02.10.02.18.42; Wed, 10 Feb 2016 02:18:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-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-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757386AbcBJKSj (ORCPT + 7 others); Wed, 10 Feb 2016 05:18:39 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:35331 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757330AbcBJKSh (ORCPT ); Wed, 10 Feb 2016 05:18:37 -0500 Received: by mail-wm0-f52.google.com with SMTP id c200so21095707wme.0 for ; Wed, 10 Feb 2016 02:18:36 -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=xF5yP2YdQauyPhL6Na06eaKe8npF/YtXH7q/z1F2mDA=; b=boJJLdmgp2vNEci9ocykDCSESqlAGbE/siN5HqEJk3gnTl8OxBTNYZHg5KalX9pqh6 Rx11UdJBZzM15kXinMWQAJcYS+XcJXhkBmdyJHJ2CYTYU3rwniBfn5uylU2LliTbOJ+R Qp5jQTHf1VZRk34C2uBscl1D7VeuB9R9Mkau8= 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=xF5yP2YdQauyPhL6Na06eaKe8npF/YtXH7q/z1F2mDA=; b=S60GTXxqA3CDt/7AVxKkRGfigPK+mT5TwRn7uvMJeY3ff/q69j1jp5I0C17Wevlsin fm3iHY48/DrIX1EVAeQsbYlluwJbGMsPYOlj+YBQtg/PCUr56lbPn4Cu9v1uyb15wHFj xu47Zf0eD/6GCpoFQByCrj//2ZQjcKNZgQ0Jyallzs4rrxXJQ70grG9o+82ovIMYwkpW owla6M20O52pj4v+AT77xh5XZ0VVPAGD3h9zB2W7CWfVUq+yJclc3MUP3/hSEsir4J6H VoYMr/DLTAao3j07T1NQGLRAaMymD/oWmi6AV+0+JbEFFprcG6gryaVD3BkKyqsIDxuh zlSg== X-Gm-Message-State: AG10YOTgT6st+tlB4Z7TyIp8BJaQQUtqaTz/wqXMgvCEodVwHNy3lsEATjDsS3I/GkZcU0KQ X-Received: by 10.194.192.71 with SMTP id he7mr45494963wjc.82.1455099516123; Wed, 10 Feb 2016 02:18:36 -0800 (PST) Received: from localhost.localdomain (host-92-13-246-184.as43234.net. [92.13.246.184]) by smtp.gmail.com with ESMTPSA id q129sm2718253wmd.14.2016.02.10.02.18.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Feb 2016 02:18:35 -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 03/14] ASoC: qcom: rename rdmactl_audif_start to dmactrl_audif_start Date: Wed, 10 Feb 2016 10:18:32 +0000 Message-Id: <1455099512-448-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 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 --- sound/soc/qcom/lpass-apq8016.c | 2 +- sound/soc/qcom/lpass-platform.c | 2 +- sound/soc/qcom/lpass.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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..1c3eb65 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, rdma_port = pcm_data->i2s_port + v->dmactl_audif_start; bitwidth = snd_pcm_format_width(format); if (bitwidth < 0) { 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);