From patchwork Wed Feb 10 10:19:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 61630 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2552885lbl; Wed, 10 Feb 2016 02:20:07 -0800 (PST) X-Received: by 10.66.62.132 with SMTP id y4mr56707012par.49.1455099607842; Wed, 10 Feb 2016 02:20:07 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rq5si4167458pab.160.2016.02.10.02.20.07; Wed, 10 Feb 2016 02:20:07 -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 S1757878AbcBJKUF (ORCPT + 30 others); Wed, 10 Feb 2016 05:20:05 -0500 Received: from mail-wm0-f46.google.com ([74.125.82.46]:38576 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757419AbcBJKT6 (ORCPT ); Wed, 10 Feb 2016 05:19:58 -0500 Received: by mail-wm0-f46.google.com with SMTP id p63so19681289wmp.1 for ; Wed, 10 Feb 2016 02:19:57 -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=Daobo/YwJ7bOWD1hJ/4PXnWCGM+e/Z9FcnSHFxnw0So=; b=i+z7+HpWvfhd6r51l2ReM37sy80hJTn5mirQ+PpsWOBcESExnkaJiBP72ckJv00Fgg FXZS3vbC/GPu1iYBz9F1fpY+rYKKEhkvFzSvkOv169Mh3T6QKgFratCW0VVnE3XssJQ4 C2CohiKASqWfjOROvRebOf0NYqEs7AcAuEtMQ= 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=Daobo/YwJ7bOWD1hJ/4PXnWCGM+e/Z9FcnSHFxnw0So=; b=OMeafNLbLS8Ws7GOn2TszV6KMrSvgbzT4yy5YUpHkvsr6sigsxSqbEpO6PSvyODHgg lITnLfgQ6g2QfUfLp52ubmgpgRRVYQcXkukaJiDAYrgtDwvlJYjmIV6T47sJK3CusCST HvlciOPsWPtfu3kdGW66MSBGI7/O2hDtVyHdQdp2dgrrvuptFZvBzVTyg8TTetNKABPE Y/vkEbOCiiE8d8O6YdvyGIaTOEAh+zppRN4J4ycJF1ciz6k1QaTig1X6MvdOCupd8WaA 8bbM25Bo2P5ctKcE2r+J02oi21vGwnwEg5z0jJK/DEKr5F3KXuBA5LSHbK0TU/4/Ng2r V7SQ== X-Gm-Message-State: AG10YOSzCWY3WmiDQnBl2amw6+JvNwQxDSc456TSZvV9Hm7ZcnzIUqpSFJ0sPZuAXuWWFsW5 X-Received: by 10.194.158.73 with SMTP id ws9mr43720652wjb.40.1455099596577; Wed, 10 Feb 2016 02:19:56 -0800 (PST) Received: from localhost.localdomain (host-92-13-246-184.as43234.net. [92.13.246.184]) by smtp.gmail.com with ESMTPSA id z65sm23005052wmg.1.2016.02.10.02.19.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Feb 2016 02:19:56 -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 12/14] ASoC: qcom: apq8016: set the correct max register for regmap Date: Wed, 10 Feb 2016 10:19:53 +0000 Message-Id: <1455099593-851-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that we are ready to access wrdma registers, set the max register and other regmap related configs to use correct values. Signed-off-by: Srinivas Kandagatla Acked-by: Kenneth Westfield --- sound/soc/qcom/lpass-cpu.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) -- 1.9.1 diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 00b6c9d..82e16b2 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -294,6 +294,17 @@ static bool lpass_cpu_regmap_writeable(struct device *dev, unsigned int reg) return true; } + for (i = 0; i < v->wrdma_channels; ++i) { + if (reg == LPAIF_WRDMACTL_REG(v, i + v->wrdma_channel_start)) + return true; + if (reg == LPAIF_WRDMABASE_REG(v, i + v->wrdma_channel_start)) + return true; + if (reg == LPAIF_WRDMABUFF_REG(v, i + v->wrdma_channel_start)) + return true; + if (reg == LPAIF_WRDMAPER_REG(v, i + v->wrdma_channel_start)) + return true; + } + return false; } @@ -327,6 +338,19 @@ static bool lpass_cpu_regmap_readable(struct device *dev, unsigned int reg) return true; } + for (i = 0; i < v->wrdma_channels; ++i) { + if (reg == LPAIF_WRDMACTL_REG(v, i + v->wrdma_channel_start)) + return true; + if (reg == LPAIF_WRDMABASE_REG(v, i + v->wrdma_channel_start)) + return true; + if (reg == LPAIF_WRDMABUFF_REG(v, i + v->wrdma_channel_start)) + return true; + if (reg == LPAIF_WRDMACURR_REG(v, i + v->wrdma_channel_start)) + return true; + if (reg == LPAIF_WRDMAPER_REG(v, i + v->wrdma_channel_start)) + return true; + } + return false; } @@ -344,6 +368,10 @@ static bool lpass_cpu_regmap_volatile(struct device *dev, unsigned int reg) if (reg == LPAIF_RDMACURR_REG(v, i)) return true; + for (i = 0; i < v->wrdma_channels; ++i) + if (reg == LPAIF_WRDMACURR_REG(v, i + v->wrdma_channel_start)) + return true; + return false; } @@ -399,8 +427,9 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) return PTR_ERR((void const __force *)drvdata->lpaif); } - lpass_cpu_regmap_config.max_register = LPAIF_RDMAPER_REG(variant, - variant->rdma_channels); + lpass_cpu_regmap_config.max_register = LPAIF_WRDMAPER_REG(variant, + variant->wrdma_channels + + variant->wrdma_channel_start); drvdata->lpaif_map = devm_regmap_init_mmio(&pdev->dev, drvdata->lpaif, &lpass_cpu_regmap_config);