From patchwork Fri Apr 13 18:14:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 152366 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 564F0B6FEB for ; Sat, 14 Apr 2012 04:14:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755507Ab2DMSOU (ORCPT ); Fri, 13 Apr 2012 14:14:20 -0400 Received: from avon.wwwdotorg.org ([70.85.31.133]:38338 "EHLO avon.wwwdotorg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755503Ab2DMSOT (ORCPT ); Fri, 13 Apr 2012 14:14:19 -0400 Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id C774F644D; Fri, 13 Apr 2012 12:14:39 -0600 (MDT) Received: from localhost.localdomain (searspoint.nvidia.com [216.228.112.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id CFB73E4786; Fri, 13 Apr 2012 12:14:17 -0600 (MDT) From: Stephen Warren To: Mark Brown , Liam Girdwood Cc: alsa-devel@alsa-project.org, linux-tegra@vger.kernel.org, Stephen Warren Subject: [PATCH V2 REBASE 4/4] ASoC: convert Tegra20 DAS driver to regmap Date: Fri, 13 Apr 2012 12:14:08 -0600 Message-Id: <1334340848-30784-4-git-send-email-swarren@wwwdotorg.org> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1334340848-30784-1-git-send-email-swarren@wwwdotorg.org> References: <1334340848-30784-1-git-send-email-swarren@wwwdotorg.org> X-NVConfidentiality: public X-Virus-Scanned: clamav-milter 0.96.5 at avon.wwwdotorg.org X-Virus-Status: Clean Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Stephen Warren Signed-off-by: Stephen Warren --- v2: Split into separate patch. Simplified tegra20_das_wr_rd_reg(). --- sound/soc/tegra/tegra20_das.c | 99 +++++++++++++++-------------------------- sound/soc/tegra/tegra20_das.h | 3 +- 2 files changed, 37 insertions(+), 65 deletions(-) diff --git a/sound/soc/tegra/tegra20_das.c b/sound/soc/tegra/tegra20_das.c index 812696d..bf99296 100644 --- a/sound/soc/tegra/tegra20_das.c +++ b/sound/soc/tegra/tegra20_das.c @@ -20,12 +20,11 @@ * */ -#include #include #include #include #include -#include +#include #include #include #include "tegra20_das.h" @@ -36,12 +35,14 @@ static struct tegra20_das *das; static inline void tegra20_das_write(u32 reg, u32 val) { - __raw_writel(val, das->regs + reg); + regmap_write(das->regmap, reg, val); } static inline u32 tegra20_das_read(u32 reg) { - return __raw_readl(das->regs + reg); + u32 val; + regmap_read(das->regmap, reg, &val); + return val; } int tegra20_das_connect_dap_to_dac(int dap, int dac) @@ -104,68 +105,36 @@ int tegra20_das_connect_dac_to_dap(int dac, int dap) } EXPORT_SYMBOL_GPL(tegra20_das_connect_dac_to_dap); -#ifdef CONFIG_DEBUG_FS -static int tegra20_das_show(struct seq_file *s, void *unused) -{ - int i; - u32 addr; - u32 reg; - - for (i = 0; i < TEGRA20_DAS_DAP_CTRL_SEL_COUNT; i++) { - addr = TEGRA20_DAS_DAP_CTRL_SEL + - (i * TEGRA20_DAS_DAP_CTRL_SEL_STRIDE); - reg = tegra20_das_read(addr); - seq_printf(s, "TEGRA20_DAS_DAP_CTRL_SEL[%d] = %08x\n", i, reg); - } - - for (i = 0; i < TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_COUNT; i++) { - addr = TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL + - (i * TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL_STRIDE); - reg = tegra20_das_read(addr); - seq_printf(s, "TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL[%d] = %08x\n", - i, reg); - } +#define LAST_REG(name) \ + (TEGRA20_DAS_##name + \ + (TEGRA20_DAS_##name##_STRIDE * (TEGRA20_DAS_##name##_COUNT - 1))) - return 0; -} - -static int tegra20_das_debug_open(struct inode *inode, struct file *file) +static bool tegra20_das_wr_rd_reg(struct device *dev, unsigned int reg) { - return single_open(file, tegra20_das_show, inode->i_private); + if ((reg >= TEGRA20_DAS_DAP_CTRL_SEL) && + (reg <= LAST_REG(DAP_CTRL_SEL))) + return true; + if ((reg >= TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL) && + (reg <= LAST_REG(DAC_INPUT_DATA_CLK_SEL))) + return true; + + return false; } -static const struct file_operations tegra20_das_debug_fops = { - .open = tegra20_das_debug_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, +static const struct regmap_config tegra20_das_regmap_config = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = LAST_REG(DAC_INPUT_DATA_CLK_SEL), + .writeable_reg = tegra20_das_wr_rd_reg, + .readable_reg = tegra20_das_wr_rd_reg, + .cache_type = REGCACHE_RBTREE, }; -static void tegra20_das_debug_add(struct tegra20_das *das) -{ - das->debug = debugfs_create_file(DRV_NAME, S_IRUGO, - snd_soc_debugfs_root, das, - &tegra20_das_debug_fops); -} - -static void tegra20_das_debug_remove(struct tegra20_das *das) -{ - if (das->debug) - debugfs_remove(das->debug); -} -#else -static inline void tegra20_das_debug_add(struct tegra20_das *das) -{ -} - -static inline void tegra20_das_debug_remove(struct tegra20_das *das) -{ -} -#endif - static int __devinit tegra20_das_probe(struct platform_device *pdev) { struct resource *res, *region; + void __iomem *regs; int ret = 0; if (das) @@ -194,13 +163,21 @@ static int __devinit tegra20_das_probe(struct platform_device *pdev) goto err; } - das->regs = devm_ioremap(&pdev->dev, res->start, resource_size(res)); - if (!das->regs) { + regs = devm_ioremap(&pdev->dev, res->start, resource_size(res)); + if (!regs) { dev_err(&pdev->dev, "ioremap failed\n"); ret = -ENOMEM; goto err; } + das->regmap = devm_regmap_init_mmio(&pdev->dev, regs, + &tegra20_das_regmap_config); + if (IS_ERR(das->regmap)) { + dev_err(&pdev->dev, "regmap init failed\n"); + ret = PTR_ERR(das->regmap); + goto err; + } + ret = tegra20_das_connect_dap_to_dac(TEGRA20_DAS_DAP_ID_1, TEGRA20_DAS_DAP_SEL_DAC1); if (ret) { @@ -214,8 +191,6 @@ static int __devinit tegra20_das_probe(struct platform_device *pdev) goto err; } - tegra20_das_debug_add(das); - platform_set_drvdata(pdev, das); return 0; @@ -230,8 +205,6 @@ static int __devexit tegra20_das_remove(struct platform_device *pdev) if (!das) return -ENODEV; - tegra20_das_debug_remove(das); - das = NULL; return 0; diff --git a/sound/soc/tegra/tegra20_das.h b/sound/soc/tegra/tegra20_das.h index ade4fe0..be217f3 100644 --- a/sound/soc/tegra/tegra20_das.h +++ b/sound/soc/tegra/tegra20_das.h @@ -85,8 +85,7 @@ struct tegra20_das { struct device *dev; - void __iomem *regs; - struct dentry *debug; + struct regmap *regmap; }; /*