April 2012 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] FriendlyArm mini2440 S3C2440 UDA1341 duplex support
by jarek 11 Apr '12

11 Apr '12

Hello! Can someone confirm, that this board has full-duplex audio support ? best regards Jarek

1 0

[alsa-devel] [PATCH v2] ASoC: wm9712: Fix build due to removal of 'runtime' definition
by Fabio Estevam 11 Apr '12

11 Apr '12

Fix the following build error: sound/soc/codecs/wm9712.c:482:32: error: 'runtime' undeclared (first use in this function) sound/soc/codecs/wm9712.c:499:33: error: 'runtime' undeclared (first use in this function) This was caused by commit e6968a (ASoC: codecs: Remove rtd->codec usage from CODEC drivers), which removed the 'struct snd_pcm_runtime *runtime = substream->runtime' definition. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> sound/soc/codecs/wm9712.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 2603863..eee8170 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -479,7 +479,7 @@ static int ac97_prepare(struct snd_pcm_substream *substream, else reg = AC97_PCM_LR_ADC_RATE; - return ac97_write(codec, reg, runtime->rate); + return ac97_write(codec, reg, substream->runtime->rate); } static int ac97_aux_prepare(struct snd_pcm_substream *substream, @@ -496,7 +496,8 @@ static int ac97_aux_prepare(struct snd_pcm_substream *substream, if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) return -ENODEV; - return ac97_write(codec, AC97_PCM_SURR_DAC_RATE, runtime->rate); + return ac97_write(codec, AC97_PCM_SURR_DAC_RATE, + substream->runtime->rate); } #define WM9712_AC97_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\ -- 1.7.1

1 0

[alsa-devel] [PATCH] ASoC: tegra: convert to regmap
by Stephen Warren 11 Apr '12

11 Apr '12

From: Stephen Warren <swarren(a)nvidia.com> For the Tegra I2S, SPDIF, and DAS drivers Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- Mark, this depends on the regmap->ASoC git pull request that I just sent. sound/soc/tegra/Kconfig | 1 + sound/soc/tegra/tegra20_das.c | 99 ++++++++-------------- sound/soc/tegra/tegra20_das.h | 3 +- sound/soc/tegra/tegra20_i2s.c | 149 ++++++++++++++++----------------- sound/soc/tegra/tegra20_i2s.h | 3 +- sound/soc/tegra/tegra20_spdif.c | 177 ++++++++++++++++++++------------------- sound/soc/tegra/tegra20_spdif.h | 3 +- 7 files changed, 203 insertions(+), 232 deletions(-) diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index 556cac2..d70fe94 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig @@ -1,6 +1,7 @@ config SND_SOC_TEGRA tristate "SoC Audio for the Tegra System-on-Chip" depends on ARCH_TEGRA && TEGRA_SYSTEM_DMA + select REGMAP_MMIO help Say Y or M here if you want support for SoC audio on Tegra. diff --git a/sound/soc/tegra/tegra20_das.c b/sound/soc/tegra/tegra20_das.c index 812696d..dacd5cf 100644 --- a/sound/soc/tegra/tegra20_das.c +++ b/sound/soc/tegra/tegra20_das.c @@ -20,12 +20,11 @@ * */ -#include <linux/debugfs.h> #include <linux/device.h> #include <linux/io.h> #include <linux/module.h> #include <linux/platform_device.h> -#include <linux/seq_file.h> +#include <linux/regmap.h> #include <linux/slab.h> #include <sound/soc.h> #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,38 @@ 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); - } - - return 0; -} - -static int tegra20_das_debug_open(struct inode *inode, struct file *file) -{ - return single_open(file, tegra20_das_show, inode->i_private); -} +#define LAST_REG(name) \ + (TEGRA20_DAS_##name + \ + (TEGRA20_DAS_##name##_STRIDE * TEGRA20_DAS_##name##_COUNT) - 4) -static const struct file_operations tegra20_das_debug_fops = { - .open = tegra20_das_debug_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +#define REG_IN_ARRAY(reg, name) \ + ((reg >= TEGRA20_DAS_##name) && \ + (reg <= LAST_REG(name) && \ + (!((reg - TEGRA20_DAS_##name) % TEGRA20_DAS_##name##_STRIDE)))) -static void tegra20_das_debug_add(struct tegra20_das *das) +static bool tegra20_das_wr_rd_reg(struct device *dev, unsigned int reg) { - das->debug = debugfs_create_file(DRV_NAME, S_IRUGO, - snd_soc_debugfs_root, das, - &tegra20_das_debug_fops); -} + if (REG_IN_ARRAY(reg, DAP_CTRL_SEL) || + REG_IN_ARRAY(reg, DAC_INPUT_DATA_CLK_SEL)) + return true; -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) -{ + return false; } -static inline void tegra20_das_debug_remove(struct tegra20_das *das) -{ -} -#endif +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 int __devinit tegra20_das_probe(struct platform_device *pdev) { struct resource *res, *region; + void __iomem *regs; int ret = 0; if (das) @@ -194,13 +165,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 +193,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 +207,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; }; /* diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c index 6957658..0c7af63 100644 --- a/sound/soc/tegra/tegra20_i2s.c +++ b/sound/soc/tegra/tegra20_i2s.c @@ -29,14 +29,13 @@ */ #include <linux/clk.h> -#include <linux/debugfs.h> #include <linux/device.h> #include <linux/io.h> #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> -#include <linux/seq_file.h> +#include <linux/regmap.h> #include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h> @@ -49,12 +48,14 @@ static inline void tegra20_i2s_write(struct tegra20_i2s *i2s, u32 reg, u32 val) { - __raw_writel(val, i2s->regs + reg); + regmap_write(i2s->regmap, reg, val); } static inline u32 tegra20_i2s_read(struct tegra20_i2s *i2s, u32 reg) { - return __raw_readl(i2s->regs + reg); + u32 val; + regmap_read(i2s->regmap, reg, &val); + return val; } static int tegra20_i2s_runtime_suspend(struct device *dev) @@ -80,74 +81,6 @@ static int tegra20_i2s_runtime_resume(struct device *dev) return 0; } -#ifdef CONFIG_DEBUG_FS -static int tegra20_i2s_show(struct seq_file *s, void *unused) -{ -#define REG(r) { r, #r } - static const struct { - int offset; - const char *name; - } regs[] = { - REG(TEGRA20_I2S_CTRL), - REG(TEGRA20_I2S_STATUS), - REG(TEGRA20_I2S_TIMING), - REG(TEGRA20_I2S_FIFO_SCR), - REG(TEGRA20_I2S_PCM_CTRL), - REG(TEGRA20_I2S_NW_CTRL), - REG(TEGRA20_I2S_TDM_CTRL), - REG(TEGRA20_I2S_TDM_TX_RX_CTRL), - }; -#undef REG - - struct tegra20_i2s *i2s = s->private; - int i; - - clk_enable(i2s->clk_i2s); - - for (i = 0; i < ARRAY_SIZE(regs); i++) { - u32 val = tegra20_i2s_read(i2s, regs[i].offset); - seq_printf(s, "%s = %08x\n", regs[i].name, val); - } - - clk_disable(i2s->clk_i2s); - - return 0; -} - -static int tegra20_i2s_debug_open(struct inode *inode, struct file *file) -{ - return single_open(file, tegra20_i2s_show, inode->i_private); -} - -static const struct file_operations tegra20_i2s_debug_fops = { - .open = tegra20_i2s_debug_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static void tegra20_i2s_debug_add(struct tegra20_i2s *i2s) -{ - i2s->debug = debugfs_create_file(i2s->dai.name, S_IRUGO, - snd_soc_debugfs_root, i2s, - &tegra20_i2s_debug_fops); -} - -static void tegra20_i2s_debug_remove(struct tegra20_i2s *i2s) -{ - if (i2s->debug) - debugfs_remove(i2s->debug); -} -#else -static inline void tegra20_i2s_debug_add(struct tegra_i2s *i2s) -{ -} - -static inline void tegra20_i2s_debug_remove(struct tegra20_i2s *i2s) -{ -} -#endif - static int tegra20_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { @@ -343,12 +276,68 @@ static const struct snd_soc_dai_driver tegra20_i2s_dai_template = { .symmetric_rates = 1, }; +static bool tegra20_i2s_wr_rd_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case TEGRA20_I2S_CTRL: + case TEGRA20_I2S_STATUS: + case TEGRA20_I2S_TIMING: + case TEGRA20_I2S_FIFO_SCR: + case TEGRA20_I2S_PCM_CTRL: + case TEGRA20_I2S_NW_CTRL: + case TEGRA20_I2S_TDM_CTRL: + case TEGRA20_I2S_TDM_TX_RX_CTRL: + case TEGRA20_I2S_FIFO1: + case TEGRA20_I2S_FIFO2: + return true; + default: + return false; + }; +} + +static bool tegra20_i2s_volatile_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case TEGRA20_I2S_STATUS: + case TEGRA20_I2S_FIFO_SCR: + case TEGRA20_I2S_FIFO1: + case TEGRA20_I2S_FIFO2: + return true; + default: + return false; + }; +} + +static bool tegra20_i2s_precious_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case TEGRA20_I2S_FIFO1: + case TEGRA20_I2S_FIFO2: + return true; + default: + return false; + }; +} + +static const struct regmap_config tegra20_i2s_regmap_config = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = TEGRA20_I2S_FIFO2, + .writeable_reg = tegra20_i2s_wr_rd_reg, + .readable_reg = tegra20_i2s_wr_rd_reg, + .volatile_reg = tegra20_i2s_volatile_reg, + .precious_reg = tegra20_i2s_precious_reg, + .cache_type = REGCACHE_RBTREE, +}; + static __devinit int tegra20_i2s_platform_probe(struct platform_device *pdev) { struct tegra20_i2s *i2s; struct resource *mem, *memregion, *dmareq; u32 of_dma[2]; u32 dma_ch; + void __iomem *regs; int ret; i2s = devm_kzalloc(&pdev->dev, sizeof(struct tegra20_i2s), GFP_KERNEL); @@ -398,13 +387,21 @@ static __devinit int tegra20_i2s_platform_probe(struct platform_device *pdev) goto err_clk_put; } - i2s->regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem)); - if (!i2s->regs) { + regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem)); + if (!regs) { dev_err(&pdev->dev, "ioremap failed\n"); ret = -ENOMEM; goto err_clk_put; } + i2s->regmap = devm_regmap_init_mmio(&pdev->dev, regs, + &tegra20_i2s_regmap_config); + if (IS_ERR(i2s->regmap)) { + dev_err(&pdev->dev, "regmap init failed\n"); + ret = PTR_ERR(i2s->regmap); + goto err_clk_put; + } + i2s->capture_dma_data.addr = mem->start + TEGRA20_I2S_FIFO2; i2s->capture_dma_data.wrap = 4; i2s->capture_dma_data.width = 32; @@ -437,8 +434,6 @@ static __devinit int tegra20_i2s_platform_probe(struct platform_device *pdev) goto err_unregister_dai; } - tegra20_i2s_debug_add(i2s); - return 0; err_unregister_dai: @@ -465,8 +460,6 @@ static int __devexit tegra20_i2s_platform_remove(struct platform_device *pdev) tegra_pcm_platform_unregister(&pdev->dev); snd_soc_unregister_dai(&pdev->dev); - tegra20_i2s_debug_remove(i2s); - clk_put(i2s->clk_i2s); return 0; diff --git a/sound/soc/tegra/tegra20_i2s.h b/sound/soc/tegra/tegra20_i2s.h index 86ab327..a57efc6 100644 --- a/sound/soc/tegra/tegra20_i2s.h +++ b/sound/soc/tegra/tegra20_i2s.h @@ -157,8 +157,7 @@ struct tegra20_i2s { struct clk *clk_i2s; struct tegra_pcm_dma_params capture_dma_data; struct tegra_pcm_dma_params playback_dma_data; - void __iomem *regs; - struct dentry *debug; + struct regmap *regmap; u32 reg_ctrl; }; diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c index 94c5764..f9b5741 100644 --- a/sound/soc/tegra/tegra20_spdif.c +++ b/sound/soc/tegra/tegra20_spdif.c @@ -21,13 +21,12 @@ */ #include <linux/clk.h> -#include <linux/debugfs.h> #include <linux/device.h> #include <linux/io.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> -#include <linux/seq_file.h> +#include <linux/regmap.h> #include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h> @@ -41,12 +40,14 @@ static inline void tegra20_spdif_write(struct tegra20_spdif *spdif, u32 reg, u32 val) { - __raw_writel(val, spdif->regs + reg); + regmap_write(spdif->regmap, reg, val); } static inline u32 tegra20_spdif_read(struct tegra20_spdif *spdif, u32 reg) { - return __raw_readl(spdif->regs + reg); + u32 val; + regmap_read(spdif->regmap, reg, &val); + return val; } static int tegra20_spdif_runtime_suspend(struct device *dev) @@ -72,82 +73,6 @@ static int tegra20_spdif_runtime_resume(struct device *dev) return 0; } -#ifdef CONFIG_DEBUG_FS -static int tegra20_spdif_show(struct seq_file *s, void *unused) -{ -#define REG(r) { r, #r } - static const struct { - int offset; - const char *name; - } regs[] = { - REG(TEGRA20_SPDIF_CTRL), - REG(TEGRA20_SPDIF_STATUS), - REG(TEGRA20_SPDIF_STROBE_CTRL), - REG(TEGRA20_SPDIF_DATA_FIFO_CSR), - REG(TEGRA20_SPDIF_CH_STA_RX_A), - REG(TEGRA20_SPDIF_CH_STA_RX_B), - REG(TEGRA20_SPDIF_CH_STA_RX_C), - REG(TEGRA20_SPDIF_CH_STA_RX_D), - REG(TEGRA20_SPDIF_CH_STA_RX_E), - REG(TEGRA20_SPDIF_CH_STA_RX_F), - REG(TEGRA20_SPDIF_CH_STA_TX_A), - REG(TEGRA20_SPDIF_CH_STA_TX_B), - REG(TEGRA20_SPDIF_CH_STA_TX_C), - REG(TEGRA20_SPDIF_CH_STA_TX_D), - REG(TEGRA20_SPDIF_CH_STA_TX_E), - REG(TEGRA20_SPDIF_CH_STA_TX_F), - }; -#undef REG - - struct tegra20_spdif *spdif = s->private; - int i; - - clk_enable(spdif->clk_spdif_out); - - for (i = 0; i < ARRAY_SIZE(regs); i++) { - u32 val = tegra20_spdif_read(spdif, regs[i].offset); - seq_printf(s, "%s = %08x\n", regs[i].name, val); - } - - clk_disable(spdif->clk_spdif_out); - - return 0; -} - -static int tegra20_spdif_debug_open(struct inode *inode, struct file *file) -{ - return single_open(file, tegra20_spdif_show, inode->i_private); -} - -static const struct file_operations tegra20_spdif_debug_fops = { - .open = tegra20_spdif_debug_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static void tegra20_spdif_debug_add(struct tegra20_spdif *spdif) -{ - spdif->debug = debugfs_create_file(DRV_NAME, S_IRUGO, - snd_soc_debugfs_root, spdif, - &tegra20_spdif_debug_fops); -} - -static void tegra20_spdif_debug_remove(struct tegra20_spdif *spdif) -{ - if (spdif->debug) - debugfs_remove(spdif->debug); -} -#else -static inline void tegra20_spdif_debug_add(struct tegra20_spdif *spdif) -{ -} - -static inline void tegra20_spdif_debug_remove(struct tegra20_spdif *spdif) -{ -} -#endif - static int tegra20_spdif_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) @@ -265,10 +190,86 @@ static struct snd_soc_dai_driver tegra20_spdif_dai = { .ops = &tegra20_spdif_dai_ops, }; +static bool tegra20_spdif_wr_rd_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case TEGRA20_SPDIF_CTRL: + case TEGRA20_SPDIF_STATUS: + case TEGRA20_SPDIF_STROBE_CTRL: + case TEGRA20_SPDIF_DATA_FIFO_CSR: + case TEGRA20_SPDIF_DATA_OUT: + case TEGRA20_SPDIF_DATA_IN: + case TEGRA20_SPDIF_CH_STA_RX_A: + case TEGRA20_SPDIF_CH_STA_RX_B: + case TEGRA20_SPDIF_CH_STA_RX_C: + case TEGRA20_SPDIF_CH_STA_RX_D: + case TEGRA20_SPDIF_CH_STA_RX_E: + case TEGRA20_SPDIF_CH_STA_RX_F: + case TEGRA20_SPDIF_CH_STA_TX_A: + case TEGRA20_SPDIF_CH_STA_TX_B: + case TEGRA20_SPDIF_CH_STA_TX_C: + case TEGRA20_SPDIF_CH_STA_TX_D: + case TEGRA20_SPDIF_CH_STA_TX_E: + case TEGRA20_SPDIF_CH_STA_TX_F: + case TEGRA20_SPDIF_USR_STA_RX_A: + case TEGRA20_SPDIF_USR_DAT_TX_A: + return true; + default: + return false; + }; +} + +static bool tegra20_spdif_volatile_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case TEGRA20_SPDIF_STATUS: + case TEGRA20_SPDIF_DATA_FIFO_CSR: + case TEGRA20_SPDIF_DATA_OUT: + case TEGRA20_SPDIF_DATA_IN: + case TEGRA20_SPDIF_CH_STA_RX_A: + case TEGRA20_SPDIF_CH_STA_RX_B: + case TEGRA20_SPDIF_CH_STA_RX_C: + case TEGRA20_SPDIF_CH_STA_RX_D: + case TEGRA20_SPDIF_CH_STA_RX_E: + case TEGRA20_SPDIF_CH_STA_RX_F: + case TEGRA20_SPDIF_USR_STA_RX_A: + case TEGRA20_SPDIF_USR_DAT_TX_A: + return true; + default: + return false; + }; +} + +static bool tegra20_spdif_precious_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case TEGRA20_SPDIF_DATA_OUT: + case TEGRA20_SPDIF_DATA_IN: + case TEGRA20_SPDIF_USR_STA_RX_A: + case TEGRA20_SPDIF_USR_DAT_TX_A: + return true; + default: + return false; + }; +} + +static const struct regmap_config tegra20_spdif_regmap_config = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = TEGRA20_SPDIF_USR_DAT_TX_A, + .writeable_reg = tegra20_spdif_wr_rd_reg, + .readable_reg = tegra20_spdif_wr_rd_reg, + .volatile_reg = tegra20_spdif_volatile_reg, + .precious_reg = tegra20_spdif_precious_reg, + .cache_type = REGCACHE_RBTREE, +}; + static __devinit int tegra20_spdif_platform_probe(struct platform_device *pdev) { struct tegra20_spdif *spdif; struct resource *mem, *memregion, *dmareq; + void __iomem *regs; int ret; spdif = devm_kzalloc(&pdev->dev, sizeof(struct tegra20_spdif), @@ -309,13 +310,21 @@ static __devinit int tegra20_spdif_platform_probe(struct platform_device *pdev) goto err_clk_put; } - spdif->regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem)); - if (!spdif->regs) { + regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem)); + if (!regs) { dev_err(&pdev->dev, "ioremap failed\n"); ret = -ENOMEM; goto err_clk_put; } + spdif->regmap = devm_regmap_init_mmio(&pdev->dev, regs, + &tegra20_spdif_regmap_config); + if (IS_ERR(spdif->regmap)) { + dev_err(&pdev->dev, "regmap init failed\n"); + ret = PTR_ERR(spdif->regmap); + goto err_clk_put; + } + spdif->playback_dma_data.addr = mem->start + TEGRA20_SPDIF_DATA_OUT; spdif->playback_dma_data.wrap = 4; spdif->playback_dma_data.width = 32; @@ -341,8 +350,6 @@ static __devinit int tegra20_spdif_platform_probe(struct platform_device *pdev) goto err_unregister_dai; } - tegra20_spdif_debug_add(spdif); - return 0; err_unregister_dai: @@ -369,8 +376,6 @@ static int __devexit tegra20_spdif_platform_remove(struct platform_device *pdev) tegra_pcm_platform_unregister(&pdev->dev); snd_soc_unregister_dai(&pdev->dev); - tegra20_spdif_debug_remove(spdif); - clk_put(spdif->clk_spdif_out); return 0; diff --git a/sound/soc/tegra/tegra20_spdif.h b/sound/soc/tegra/tegra20_spdif.h index 823af4c..ed75652 100644 --- a/sound/soc/tegra/tegra20_spdif.h +++ b/sound/soc/tegra/tegra20_spdif.h @@ -464,8 +464,7 @@ struct tegra20_spdif { struct clk *clk_spdif_out; struct tegra_pcm_dma_params capture_dma_data; struct tegra_pcm_dma_params playback_dma_data; - void __iomem *regs; - struct dentry *debug; + struct regmap *regmap; u32 reg_ctrl; }; -- 1.7.0.4

2 1

[alsa-devel] [PATCH] ASoC: wm9712: Fix build due to missing definition of "runtime"
by Fabio Estevam 10 Apr '12

10 Apr '12

Fix the following build error: sound/soc/codecs/wm9712.c:482:32: error: 'runtime' undeclared (first use in this function) sound/soc/codecs/wm9712.c:499:33: error: 'runtime' undeclared (first use in this function) Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/codecs/wm9712.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 2603863..a154141 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -470,6 +470,7 @@ static int ac97_prepare(struct snd_pcm_substream *substream, struct snd_soc_codec *codec = dai->codec; int reg; u16 vra; + struct snd_pcm_runtime *runtime = substream->runtime; vra = ac97_read(codec, AC97_EXTENDED_STATUS); ac97_write(codec, AC97_EXTENDED_STATUS, vra | 0x1); @@ -487,6 +488,7 @@ static int ac97_aux_prepare(struct snd_pcm_substream *substream, { struct snd_soc_codec *codec = dai->codec; u16 vra, xsle; + struct snd_pcm_runtime *runtime = substream->runtime; vra = ac97_read(codec, AC97_EXTENDED_STATUS); ac97_write(codec, AC97_EXTENDED_STATUS, vra | 0x1); -- 1.7.1

2 3

[alsa-devel] [PATCH] ASoC: tegra: utils: Don't use of_have_populated_dt()
by Stephen Warren 10 Apr '12

10 Apr '12

From: Stephen Warren <swarren(a)nvidia.com> Recent list discussions concluded that drivers should not be calling of_have_populated_dt(), and hence of_have_populated_dt() should not be exported. Use a different mechanism to detect DT vs. non-DT boot. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- sound/soc/tegra/tegra_asoc_utils.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c index 266189d..9515ce5 100644 --- a/sound/soc/tegra/tegra_asoc_utils.c +++ b/sound/soc/tegra/tegra_asoc_utils.c @@ -119,13 +119,15 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data, data->dev = dev; - if (!of_have_populated_dt()) - data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20; - else if (of_machine_is_compatible("nvidia,tegra20")) + if (of_machine_is_compatible("nvidia,tegra20")) data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20; else if (of_machine_is_compatible("nvidia,tegra30")) data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA30; + else if (!dev->of_node) + /* non-DT is always Tegra20 */ + data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20; else + /* DT boot, but unknown SoC */ return -EINVAL; data->clk_pll_a = clk_get_sys(NULL, "pll_a"); -- 1.7.0.4

2 1

[alsa-devel] [PATCH] ASoC: wm9712: Fix build due to missing definition of "runtime"
by Fabio Estevam 10 Apr '12

10 Apr '12

Fix the following build error: sound/soc/codecs/wm9712.c:482:32: error: 'runtime' undeclared (first use in this function) sound/soc/codecs/wm9712.c:499:33: error: 'runtime' undeclared (first use in this function) Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/codecs/wm9712.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 2603863..a154141 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -470,6 +470,7 @@ static int ac97_prepare(struct snd_pcm_substream *substream, struct snd_soc_codec *codec = dai->codec; int reg; u16 vra; + struct snd_pcm_runtime *runtime = substream->runtime; vra = ac97_read(codec, AC97_EXTENDED_STATUS); ac97_write(codec, AC97_EXTENDED_STATUS, vra | 0x1); @@ -487,6 +488,7 @@ static int ac97_aux_prepare(struct snd_pcm_substream *substream, { struct snd_soc_codec *codec = dai->codec; u16 vra, xsle; + struct snd_pcm_runtime *runtime = substream->runtime; vra = ac97_read(codec, AC97_EXTENDED_STATUS); ac97_write(codec, AC97_EXTENDED_STATUS, vra | 0x1); -- 1.7.1

2 1

[alsa-devel] [GIT PULL]
by Stephen Warren 10 Apr '12

10 Apr '12

Mark, Could you please pull the following branches into ASoC's for-next: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git topic/mmio git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git topic/stride Those two are a dependency for the Tegra20 ASoC regmap conversion that I can post now. git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git topic/name That is an additional dependency for the new Tegra30 ASoC drivers. Thanks.

2 1

Re: [alsa-devel] [PATCH RESEND] ASoC: Fix setting aif_val in lm49453_set_dai_fmt
by MR Swami Reddy 10 Apr '12

10 Apr '12

This issues was fixed last week itself. URL for the patch - http://mailman.alsa-project.org/pipermail/alsa-devel/2012-April/050967.html Thanks Swami On Monday 09 April 2012 05:18 PM, Axel Lin wrote: > CBS/CBM/CFS/CFM settings are controlled by BIT[3:4] of 0x60h > > for example, for SND_SOC_DAIFMT_CBS_CFS: what we want is to clear both BIT[3:4]. > > aif_val = ~LM49453_AUDIO_PORT1_BASIC_CLK_MS | ~LM49453_AUDIO_PORT1_BASIC_SYNC_MS; > actually set both bits. > > Signed-off-by: Axel Lin <axel.lin(a)gmail.com> > --- > Seems the my mail failed to reach alsa mailing list. > I resend to LKML instead. > > Axel > sound/soc/codecs/lm49453.c | 8 ++------ > 1 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c > index 744063d..a25e80a 100644 > --- a/sound/soc/codecs/lm49453.c > +++ b/sound/soc/codecs/lm49453.c > @@ -1185,16 +1185,12 @@ static int lm49453_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) > > switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { > case SND_SOC_DAIFMT_CBS_CFS: > - aif_val = ~LM49453_AUDIO_PORT1_BASIC_CLK_MS | > - ~LM49453_AUDIO_PORT1_BASIC_SYNC_MS; > break; > case SND_SOC_DAIFMT_CBS_CFM: > - aif_val = ~LM49453_AUDIO_PORT1_BASIC_CLK_MS | > - LM49453_AUDIO_PORT1_BASIC_SYNC_MS; > + aif_val = LM49453_AUDIO_PORT1_BASIC_SYNC_MS; > break; > case SND_SOC_DAIFMT_CBM_CFS: > - aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS | > - ~LM49453_AUDIO_PORT1_BASIC_SYNC_MS; > + aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS; > break; > case SND_SOC_DAIFMT_CBM_CFM: > aif_val = LM49453_AUDIO_PORT1_BASIC_CLK_MS | > -- > 1.7.5.4 > > >

1 0

[alsa-devel] [PATCH] ASoC: dapm: Allow DAI widgets to be routed through
by Mark Brown 10 Apr '12

10 Apr '12

In order to allow CODEC<->CODEC links to function we will need to allow DAPM paths to be created that pass through DAIs rather than only ones that are source or sunk at the DAI. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-dapm.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index d97e652..2c3363e 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -923,7 +923,10 @@ static int dapm_dai_check_power(struct snd_soc_dapm_widget *w) { DAPM_UPDATE_STAT(w, power_checks); - return w->active; + if (w->active) + return w->active; + + return dapm_generic_check_power(w); } /* Check to see if an ADC has power */ -- 1.7.9.1

1 0

Re: [alsa-devel] [PATCH 6/6] ALSA: hda - clean up CX20549 test mixer setup
by David Henningsson 10 Apr '12

10 Apr '12

On 04/06/2012 03:34 PM, Michael Karcher wrote: > name pins consistently (MIC1/LINE1/HP-OUT/CD) on all controls > affecting those pins. If this is a test mixer only, so maybe it does not matter that much, but anyway: Loopback controls are usually labeled "Line Playback Volume" "Mic Playback Volume" And outputs: "Headphone Playback Volume" For line outputs, I'm not sure if the right thing is "Front Playback Volume", "Line-Out Playback Volume", or "Line Out Playback Volume" > remove duplicate SET_AMP_GAIN_MUTE to 0x17/index 0 and 0x17/index 1 > > really select MIC1, not Mixer out for recording > > "Mixer out" for recording is not a "pin", adjust comment > > Signed-off-by: Michael Karcher<kernel(a)mkarcher.dialup.fu-berlin.de> > --- > sound/pci/hda/patch_conexant.c | 38 +++++++++++++++++--------------------- > 1 files changed, 17 insertions(+), 21 deletions(-) > > diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c > index 8fe9f9d..a36488d 100644 > --- a/sound/pci/hda/patch_conexant.c > +++ b/sound/pci/hda/patch_conexant.c > @@ -930,10 +930,10 @@ static const struct snd_kcontrol_new cxt5045_test_mixer[] = { > /* Output controls */ > HDA_CODEC_VOLUME("Speaker Playback Volume", 0x10, 0x0, HDA_OUTPUT), > HDA_CODEC_MUTE("Speaker Playback Switch", 0x10, 0x0, HDA_OUTPUT), > - HDA_CODEC_VOLUME("Node 11 Playback Volume", 0x11, 0x0, HDA_OUTPUT), > - HDA_CODEC_MUTE("Node 11 Playback Switch", 0x11, 0x0, HDA_OUTPUT), > - HDA_CODEC_VOLUME("Node 12 Playback Volume", 0x12, 0x0, HDA_OUTPUT), > - HDA_CODEC_MUTE("Node 12 Playback Switch", 0x12, 0x0, HDA_OUTPUT), > + HDA_CODEC_VOLUME("HP-OUT Playback Volume", 0x11, 0x0, HDA_OUTPUT), > + HDA_CODEC_MUTE("HP-OUT Playback Switch", 0x11, 0x0, HDA_OUTPUT), > + HDA_CODEC_VOLUME("LINE1 Playback Volume", 0x12, 0x0, HDA_OUTPUT), > + HDA_CODEC_MUTE("LINE1 Playback Switch", 0x12, 0x0, HDA_OUTPUT), > > /* Modes for retasking pin widgets */ > CXT_PIN_MODE("HP-OUT pin mode", 0x11, CXT_PIN_DIR_INOUT), > @@ -944,16 +944,16 @@ static const struct snd_kcontrol_new cxt5045_test_mixer[] = { > > /* Loopback mixer controls */ > > - HDA_CODEC_VOLUME("Mixer-1 Volume", 0x17, 0x0, HDA_INPUT), > - HDA_CODEC_MUTE("Mixer-1 Switch", 0x17, 0x0, HDA_INPUT), > - HDA_CODEC_VOLUME("Mixer-2 Volume", 0x17, 0x1, HDA_INPUT), > - HDA_CODEC_MUTE("Mixer-2 Switch", 0x17, 0x1, HDA_INPUT), > - HDA_CODEC_VOLUME("Mixer-3 Volume", 0x17, 0x2, HDA_INPUT), > - HDA_CODEC_MUTE("Mixer-3 Switch", 0x17, 0x2, HDA_INPUT), > - HDA_CODEC_VOLUME("Mixer-4 Volume", 0x17, 0x3, HDA_INPUT), > - HDA_CODEC_MUTE("Mixer-4 Switch", 0x17, 0x3, HDA_INPUT), > - HDA_CODEC_VOLUME("Mixer-5 Volume", 0x17, 0x4, HDA_INPUT), > - HDA_CODEC_MUTE("Mixer-5 Switch", 0x17, 0x4, HDA_INPUT), > + HDA_CODEC_VOLUME("PCM Volume", 0x17, 0x0, HDA_INPUT), > + HDA_CODEC_MUTE("PCM Switch", 0x17, 0x0, HDA_INPUT), > + HDA_CODEC_VOLUME("MIC1 pin Volume", 0x17, 0x1, HDA_INPUT), > + HDA_CODEC_MUTE("MIC1 pin Switch", 0x17, 0x1, HDA_INPUT), > + HDA_CODEC_VOLUME("LINE1 pin Volume", 0x17, 0x2, HDA_INPUT), > + HDA_CODEC_MUTE("LINE1 pin Switch", 0x17, 0x2, HDA_INPUT), > + HDA_CODEC_VOLUME("HP-OUT pin Volume", 0x17, 0x3, HDA_INPUT), > + HDA_CODEC_MUTE("HP-OUT pin Switch", 0x17, 0x3, HDA_INPUT), Eh, is there a loopback control from the headphone? > + HDA_CODEC_VOLUME("CD pin Volume", 0x17, 0x4, HDA_INPUT), > + HDA_CODEC_MUTE("CD pin Switch", 0x17, 0x4, HDA_INPUT), > { > .iface = SNDRV_CTL_ELEM_IFACE_MIXER, > .name = "Input Source", > @@ -985,10 +985,6 @@ static const struct hda_verb cxt5045_test_init_verbs[] = { > {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, > {0x18, AC_VERB_SET_DIGI_CONVERT_1, 0}, > > - /* Start with output sum widgets muted and their output gains at min */ > - {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, > - {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, > - > /* Unmute retasking pin widget output buffers since the default > * state appears to be output. As the pin mode is changed by the > * user the pin mode control will take care of enabling the pin's > @@ -1003,11 +999,11 @@ static const struct hda_verb cxt5045_test_init_verbs[] = { > /* Set ADC connection select to match default mixer setting (mic1 > * pin) > */ > - {0x1a, AC_VERB_SET_CONNECT_SEL, 0x00}, > - {0x17, AC_VERB_SET_CONNECT_SEL, 0x00}, > + {0x1a, AC_VERB_SET_CONNECT_SEL, 0x01}, > + {0x17, AC_VERB_SET_CONNECT_SEL, 0x01}, > > /* Mute all inputs to mixer widget (even unconnected ones) */ > - {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* Mixer pin */ > + {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* Mixer */ > {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* Mic1 pin */ > {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* Line pin */ > {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* HP pin */ -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

2 1