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

Re: [alsa-devel] [PATCH] ASoC: max98090: add shutdown callback for max98090
by Caesar Wang 16 Apr '15

16 Apr '15

在 2015年04月16日 05:14, Anish Kumar 写道: > 在 04/10/2015 03:38 AM, Anish Kumar 写道: >>> To fix pop noise when shutdown,the pop noise during shutdown >>> is the pmic cutoff power of codec without any notice. >> Is the power turned off without any intimation to the codec driver? >> Or is it physically removed? Can you describe the probelm >> better? >> When device is shutdown with playing music, the origin driver does nothing for shutdown operation, >> as a result, pmic will cut off the power of codec IC, thus cause a pop noise from speaker and headphone. >> So the patch added a shutdown callback for driver, enable volume smoothing and disable zero cross, >> this is referenced from mic_input which does the samething before mic switch. >> I'm very happy if some suggestion from maximintegrate . :-) > Please let me know if the patch worked for you. Yes, the patch can work for me. We had tested on chromiumos. >> +static void max98090_i2c_shutdown(struct i2c_client *i2c) >> +{ >> + struct max98090_priv *max98090 = dev_get_drvdata(&i2c->dev); >> + >> + dev_info(&i2c->dev, "shut down device\n"); >> + >> + /* Enable volume smoothing, disable zero cross. This will cause >> + * a quick 40ms ramp to mute on shutdown. >> + */ >> + regmap_write(max98090->regmap, >> + M98090_REG_LEVEL_CONTROL, M98090_VSENN_MASK); >> + regmap_write(max98090->regmap, >> + M98090_REG_DEVICE_SHUTDOWN, 0x00); >> + msleep(40); >> +} >> + >> >> > > > > -- ************************************************************************************** 王晓腾 Caesar Wang Product R&D Dept.III Fuzhou Rockchip Electronics Co.Ltd Addr： NO.18 Building, A District, Fuzhou Software Park,Gulou District,Fuzhou, Fujian,China(Fuzhou Headquarters) 21F,Malata Building,Kejizhongyi Avenue,Nanshan District,Shenzhen (Shenzhen Office) Tel：+86-591-83991906/07 - 8221 Mobile:+86 15059456742 E-mail : wxt(a)rock-chips.com *************************************************************************************** *************************************************************************************** IMPORTANT NOTICE: This email is from Fuzhou Rockchip Electronics Co., Ltd .The contents of this email and any attachments may contain information that is privileged, confidential and/or exempt from disclosure under applicable law and relevant NDA. If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution, or use of the information is STRICTLY PROHIBITED. Please immediately contact the sender as soon as possible and destroy the material in its entirety in any format. Thank you. ***************************************************************************************

1 0

Re: [alsa-devel] parallel, real time safe waiting?
by Johannes Lorenz 15 Apr '15

15 Apr '15

Ok, last question about this topic: Is blocked snd_pcm_reading/writing both a. real time safe and b. does not "consume 100 percent cpu power", i.e. waits silently? Thanks for the help.

2 1

[alsa-devel] [PATCH] ASoC: Intel: Remove invalid kfree of devm allocated data
by Jin Yao 15 Apr '15

15 Apr '15

kbuild robot reports following warning: "sound/soc/intel/haswell/sst-haswell-ipc.c:2204:1-6: WARNING: invalid free of devm_ allocated data" As julia explains to me, the memory allocated with devm_kalloc is freed automatically on failure of a probe function. So this kfree should be removed otherwise the double free will be got in error handler path. Signed-off-by: Jin Yao <yao.jin(a)linux.intel.com> --- sound/soc/intel/haswell/sst-haswell-ipc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/intel/haswell/sst-haswell-ipc.c b/sound/soc/intel/haswell/sst-haswell-ipc.c index 344a1e9..324eceb 100644 --- a/sound/soc/intel/haswell/sst-haswell-ipc.c +++ b/sound/soc/intel/haswell/sst-haswell-ipc.c @@ -2201,7 +2201,6 @@ dma_err: dsp_new_err: sst_ipc_fini(ipc); ipc_init_err: - kfree(hsw); return ret; } EXPORT_SYMBOL_GPL(sst_hsw_dsp_init); -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: rsnd: set dmaen->chan = NULL when error case
by Kuninori Morimoto 15 Apr '15

15 Apr '15

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> rsnd_dmaen_quit() is assuming dmaen->chan is NULL if it failed to get DMAEngine channel. but, current dmaen->chan might have error value when error case (this driver is checking it by IS_ERR_OR_NULL()) This patch makes sure dmaen->chan is NULL when error case. Otherwise, it will contact to unknown address in rsnd_dmaen_quit() Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/rcar/dma.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index ac3756f..144308f 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -156,6 +156,7 @@ static int rsnd_dmaen_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id, (void *)id); } if (IS_ERR_OR_NULL(dmaen->chan)) { + dmaen->chan = NULL; dev_err(dev, "can't get dma channel\n"); goto rsnd_dma_channel_err; } -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: qcom: Return an error for invalid PCM trigger command
by Takashi Iwai 15 Apr '15

15 Apr '15

Fix a compile warning sound/soc/qcom/lpass-cpu.c: In function ‘lpass_cpu_daiops_trigger’: sound/soc/qcom/lpass-cpu.c:224:2: warning: ‘ret’ may be used uninitialized in this function [-Wmaybe-uninitialized] return ret; ^ Although switch () lists the most of existing cases, it's still better to cover the rest as an error properly. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/soc/qcom/lpass-cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 6698d058de29..dc790abaa331 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -194,7 +194,7 @@ static int lpass_cpu_daiops_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai); - int ret; + int ret = -EINVAL; switch (cmd) { case SNDRV_PCM_TRIGGER_START: -- 2.3.5

3 2

[alsa-devel] [PATCH] ASoC: Add support for NAU8825 codec to ASoC
by Chih-Chiang Chang 15 Apr '15

15 Apr '15

The NAU88L25 is an ultra-low power high performance audio codec designed for smartphone, tablet PC, and other portable devices by Nuvoton, now add linux driver support for it. Signed-off-by: Chih-Chiang Chang <ccchang12(a)nuvoton.com> --- include/sound/nau8825_plat.h | 22 ++ sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/nau8825.c | 593 +++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/nau8825.h | 150 +++++++++++ 5 files changed, 772 insertions(+) create mode 100644 include/sound/nau8825_plat.h create mode 100644 sound/soc/codecs/nau8825.c create mode 100644 sound/soc/codecs/nau8825.h diff --git a/include/sound/nau8825_plat.h b/include/sound/nau8825_plat.h new file mode 100644 index 0000000..87afcd3 --- /dev/null +++ b/include/sound/nau8825_plat.h @@ -0,0 +1,22 @@ +/* + * linux/sound/snd_nau8825.h -- Platform data for NAU8825 + * + * Copyright 2015 Nuvoton Technology Corp. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __LINUX_SND_NAU8825_H +#define __LINUX_SND_NAU8825_H + +struct nau8825_platform_data { + unsigned int audio_mclk1; + unsigned int gpio_irq; + int naudint_irq; + int headset_detect; + int button_press_detect; +}; + +#endif diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 0bddd92..8807c57 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -75,6 +75,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_MAX9877 if I2C select SND_SOC_MC13783 if MFD_MC13XXX select SND_SOC_ML26124 if I2C + select SND_SOC_NAU8825 if I2C select SND_SOC_HDMI_CODEC select SND_SOC_PCM1681 if I2C select SND_SOC_PCM1792A if SPI_MASTER @@ -464,6 +465,10 @@ config SND_SOC_MAX98357A config SND_SOC_MAX9850 tristate +config SND_SOC_NAU8825 + tristate "Nuvoton NAU8825 CODEC" + depends on I2C + config SND_SOC_PCM1681 tristate "Texas Instruments PCM1681 CODEC" depends on I2C diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 7acb6c1..acf594e 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -68,6 +68,7 @@ snd-soc-max98357a-objs := max98357a.o snd-soc-max9850-objs := max9850.o snd-soc-mc13783-objs := mc13783.o snd-soc-ml26124-objs := ml26124.o +snd-soc-nau8825-objs := nau8825.o snd-soc-hdmi-codec-objs := hdmi.o snd-soc-pcm1681-objs := pcm1681.o snd-soc-pcm1792a-codec-objs := pcm1792a.o @@ -252,6 +253,7 @@ obj-$(CONFIG_SND_SOC_MAX98357A) += snd-soc-max98357a.o obj-$(CONFIG_SND_SOC_MAX9850) += snd-soc-max9850.o obj-$(CONFIG_SND_SOC_MC13783) += snd-soc-mc13783.o obj-$(CONFIG_SND_SOC_ML26124) += snd-soc-ml26124.o +obj-$(CONFIG_SND_SOC_NAU8825) += snd-soc-nau8825.o obj-$(CONFIG_SND_SOC_HDMI_CODEC) += snd-soc-hdmi-codec.o obj-$(CONFIG_SND_SOC_PCM1681) += snd-soc-pcm1681.o obj-$(CONFIG_SND_SOC_PCM1792A) += snd-soc-pcm1792a-codec.o diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c new file mode 100644 index 0000000..a8c8f59 --- /dev/null +++ b/sound/soc/codecs/nau8825.c @@ -0,0 +1,593 @@ +/* + * linux/sound/soc/codecs/nau8825.c + * + * Copyright 2015 Nuvoton Technology Corp. + * Author: Meng-Huang Kuo <mhkuo(a)nuvoton.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/delay.h> +#include <linux/pm.h> +#include <linux/i2c.h> +#include <linux/gpio.h> +#include <linux/device.h> +#include <linux/clk.h> +#include <linux/regmap.h> +#include <linux/acpi.h> +#include <asm/div64.h> +#include <sound/jack.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> +#include <sound/initval.h> +#include <sound/tlv.h> +#include <linux/delay.h> +#include "nau8825.h" + +static int nau8825_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai); +static int nau8825_set_dai_fmt(struct snd_soc_dai *codec_dai, + unsigned int fmt); +static int nau8825_set_bias_level(struct snd_soc_codec *codec, + enum snd_soc_bias_level level); +static int nau8825_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id, + unsigned int freq, int dir); +static const DECLARE_TLV_DB_SCALE(out_hp_vol_tlv, -5400, 100, 0); +static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, 2400, 50, 1); +static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -12800, 50, 0); + +static const struct snd_kcontrol_new nau8825_snd_controls[] = { + + SOC_SINGLE_TLV("MIC Volume", NAU8825_ADC_DGAIN_CTRL, + NAU8825_ADC_DGAIN_SFT, + NAU8825_ADC_VOL_RSCL_RANGE, 0, adc_vol_tlv), + SOC_DOUBLE_TLV("HP Volume", NAU8825_HSVOL_CTRL, + NAU8825_L_HSVOL_SFT, NAU8825_R_HSVOL_SFT, + NAU8825_VOL_RSCL_RANGE, 1, out_hp_vol_tlv), + SOC_DOUBLE("HP Playback Switch", NAU8825_HSVOL_CTRL, NAU8825_L_MUTE, + NAU8825_R_MUTE, 1, 1), + SOC_SINGLE("HP Class OP", NAU8825_CLASS_G_CTRL, NAU8825_CLASS_G_SHIFT, + 1, 0), + SOC_SINGLE("DAC Right", NAU8825_DAC_CTRL, NAU8825_DAC_R_SFT, 1, 0), + SOC_SINGLE("DAC Left", NAU8825_DAC_CTRL, NAU8825_DAC_L_SFT, 1, 0), + SOC_SINGLE("DAC Right Clock", NAU8825_DAC_CTRL, NAU8825_DAC_CLK_R_SFT, + 1, 0), + SOC_SINGLE("DAC Left Clock", NAU8825_DAC_CTRL, NAU8825_DAC_CLK_L_SFT, + 1, 0), +}; + +static const struct snd_kcontrol_new nau8825_hpo_mix[] = { + SOC_DAPM_SINGLE("HP L Switch", NAU8825_HSVOL_CTRL, + NAU8825_L_MUTE_SFT, 1, 1), + SOC_DAPM_SINGLE("HP R Switch", NAU8825_HSVOL_CTRL, + NAU8825_R_MUTE_SFT, 1, 1), +}; + +static const struct snd_soc_dapm_widget nau8825_dapm_widgets[] = { + + SND_SOC_DAPM_INPUT("Mic Jack"), + SND_SOC_DAPM_MICBIAS("MIC BIAS", NAU8825_BOOST, NAU8825_G_BIAS_SFT, 0), + SND_SOC_DAPM_SUPPLY("micbias", SND_SOC_NOPM, 0, 0, + NULL, SND_SOC_DAPM_PRE_PMU + | SND_SOC_DAPM_POST_PMD), + SND_SOC_DAPM_SUPPLY("vmid", SND_SOC_NOPM, 0, 0, NULL, + SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), + /* ADCs */ + SND_SOC_DAPM_ADC("ADC L", NULL, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_ADC("ADC R", NULL, SND_SOC_NOPM, 0, 0), + /* ADC IF1 */ + SND_SOC_DAPM_PGA("IF1 ADC", SND_SOC_NOPM, 0, 0, NULL, 0), + /* Audio Interface */ + SND_SOC_DAPM_AIF_IN("AIF1RX", "AIF1 Playback", 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_AIF_OUT("AIF1TX", "AIF1 Capture", 0, SND_SOC_NOPM, 0, 0), + /* DACs */ + SND_SOC_DAPM_DAC_E("DAC L1", NULL, NAU8825_DAC_CTRL, + NAU8825_DAC_L_SFT, 0, NULL, + SND_SOC_DAPM_PRE_PMD), + SND_SOC_DAPM_DAC_E("DAC R1", NULL, NAU8825_DAC_CTRL, + NAU8825_DAC_R_SFT, 0, NULL, + SND_SOC_DAPM_PRE_PMD), + /* SPO/HPO/LOUT/Mono Mixer */ + SND_SOC_DAPM_MIXER("HPO MIX", SND_SOC_NOPM, 0, 0, nau8825_hpo_mix, + ARRAY_SIZE(nau8825_hpo_mix)), + SND_SOC_DAPM_PGA_S("HP amp", 1, NAU8825_CLASS_G_CTRL, + NAU8825_CLASS_G_SHIFT, 0, NULL, 0), + /* Output Lines */ + SND_SOC_DAPM_OUTPUT("HPOL"), + SND_SOC_DAPM_OUTPUT("HPOR"), +}; + +static const struct snd_soc_dapm_route nau8825_dapm_routes[] = { + + {"ADC L", NULL, "Mic Jack"}, + {"ADC R", NULL, "Mic Jack"}, + {"AIF1TX", NULL, "ADC L"}, + {"AIF1TX", NULL, "ADC R"}, + {"DAC L1", NULL, "AIF1RX"}, + {"DAC R1", NULL, "AIF1RX"}, + {"HPO MIX", "HP L Switch", "DAC L1"}, + {"HPO MIX", "HP R Switch", "DAC R1"}, + {"HP amp", NULL, "HPO MIX"}, + {"HPOL", NULL, "HP amp"}, + {"HPOR", NULL, "HP amp"}, +}; + +static int nau8825_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *tmp) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_codec *codec = rtd->codec; + unsigned int val_len = 0; + + switch (params_width(params)) { + case 16: + break; + case 20: + val_len |= NAU8825_I2S_DL_20; + break; + case 24: + val_len |= NAU8825_I2S_DL_24; + break; + case 32: + val_len |= NAU8825_I2S_DL_32; + break; + default: + return -EINVAL; + } + snd_soc_update_bits(codec, NAU8825_I2S_PCM_CTRL_1, + NAU8825_I2S_DL_MASK, val_len); + return 0; +} + +static int nau8825_dac_mute(struct snd_soc_dai *codec_dai, int mute) +{ + struct snd_soc_codec *codec = codec_dai->codec; + + if (mute) + snd_soc_update_bits(codec, NAU8825_DAC_MUTE_CTRL, + NAU8825_SOFT_MUTE_MASK, NAU8825_SOFT_MUTE_EN); + else + snd_soc_update_bits(codec, NAU8825_DAC_MUTE_CTRL, + NAU8825_SOFT_MUTE_MASK, NAU8825_SOFT_MUTE_DIS); + return 0; +} + +static int nau8825_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) +{ + struct snd_soc_codec *codec = codec_dai->codec; + unsigned int reg_val = 0; + + dev_dbg(codec->dev, " %s ###nau8825_set_dai_fmt %x\n", __func__, fmt); + /* interface format */ + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + break; + case SND_SOC_DAIFMT_IB_NF: + reg_val |= NAU8825_I2S_BP_INV; + break; + default: + dev_alert(codec->dev, "Invalid DAI interface format\n"); + return -EINVAL; + } + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + reg_val |= NAU8825_I2S_DF_I2S; + break; + case SND_SOC_DAIFMT_LEFT_J: + reg_val |= NAU8825_I2S_DF_LEFT; + break; + case SND_SOC_DAIFMT_RIGHT_J: + reg_val |= NAU8825_I2S_DF_RIGHT; + break; + case SND_SOC_DAIFMT_DSP_A: + reg_val |= NAU8825_I2S_DF_PCM_A; + break; + case SND_SOC_DAIFMT_DSP_B: + reg_val |= NAU8825_I2S_DF_PCM_B; + reg_val |= NAU8825_I2S_PCMB_EN; + break; + default: + dev_alert(codec->dev, "Invalid DAI I2S/PCM format\n"); + return -EINVAL; + } + snd_soc_update_bits(codec, NAU8825_I2S_PCM_CTRL_1, + NAU8825_I2S_DL_MASK | NAU8825_I2S_DF_MASK + | NAU8825_I2S_BP_MASK | NAU8825_I2S_PCMB_MASK, + reg_val); + return 0; +} + +static void config_fll_clk_12m(struct snd_soc_codec *codec) +{ + snd_soc_update_bits(codec, NAU8825_CLK_DIVIDER, 0x000F, 0x0003); + snd_soc_update_bits(codec, NAU8825_FL_1, 0x007F, 0x0001); + snd_soc_write(codec, NAU8825_FL_2, 0xC49B); + snd_soc_update_bits(codec, NAU8825_FL_3, 0x03FF, 0x0020); + snd_soc_update_bits(codec, NAU8825_FL_4, 0x0C00, 0x0800); + snd_soc_update_bits(codec, NAU8825_FL_5, 0x2000, 0x0000); + snd_soc_update_bits(codec, NAU8825_FL_6, 0x4000, 0x4000); +} + +void set_sys_clk(struct snd_soc_codec *codec, int sys_clk) +{ + pr_debug("%s :: sys_clk=%x\n", __func__, sys_clk); + switch (sys_clk) { + case NAU8825_INTERNALCLOCK: + snd_soc_write(codec, NAU8825_CLK_DIVIDER, 0x0853); + snd_soc_write(codec, NAU8825_FL_6, 0xE000); + snd_soc_write(codec, NAU8825_CLK_DIVIDER, 0x8853); + break; + case NAU8825_MCLK: + default: + snd_soc_write(codec, NAU8825_CLK_DIVIDER, 0x0853); + snd_soc_write(codec, NAU8825_FL_6, 0x6000); + snd_soc_write(codec, NAU8825_CLK_DIVIDER, 0x8853); + break; + } +} + +static int nau8825_dai_set_sysclk(struct snd_soc_dai *dai, + int clk_id, unsigned int freq, int dir) +{ + struct snd_soc_codec *codec = dai->codec; + + switch (clk_id) { + case NAU8825_MCLK: + config_fll_clk_12m(codec); + set_sys_clk(codec, clk_id); + break; + case NAU8825_INTERNALCLOCK: + set_sys_clk(codec, clk_id); + break; + default: + dev_err(codec->dev, "Wrong clock src\n"); + return -EINVAL; + } + return 0; +} + +static int nau8825_set_bias_level(struct snd_soc_codec *codec, + enum snd_soc_bias_level level) +{ + switch (level) { + case SND_SOC_BIAS_ON: + /* All power is driven by DAPM system*/ + dev_dbg(codec->dev, "###nau8825_set_bias_level BIAS_ON\n"); + snd_soc_update_bits(codec, NAU8825_BIAS_ADJ, + NAU8825_VMID_MASK, NAU8825_VMID_EN); + snd_soc_update_bits(codec, NAU8825_BOOST, + NAU8825_G_BIAS_MASK, NAU8825_G_BIAS_EN); + break; + case SND_SOC_BIAS_OFF: + dev_dbg(codec->dev, "###nau8825_set_bias_level OFF\n"); + set_sys_clk(codec, NAU8825_INTERNALCLOCK); + snd_soc_update_bits(codec, NAU8825_BIAS_ADJ, NAU8825_VMID_MASK, + NAU8825_VMID_DIS); + snd_soc_update_bits(codec, NAU8825_BOOST, + NAU8825_G_BIAS_MASK, NAU8825_G_BIAS_DIS); + break; + default: + break; + } + codec->dapm.bias_level = level; + dev_dbg(codec->dev, "## nau8825_set_bias_level %d\n", level); + return 0; +} + +static int nau8825_codec_suspend(struct snd_soc_codec *codec) +{ + nau8825_set_bias_level(codec, SND_SOC_BIAS_OFF); + return 0; +} + +static int nau8825_resume(struct snd_soc_codec *codec) +{ + nau8825_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + return 0; +} + +static const struct reg_default nau8825_reg[] = { + /* software reset */ + {0x0000, 0x0001}, + {0x0000, 0x0002}, + /* enable clock source */ + {0x0001, 0x07FF}, + /* enable VMID and Bias */ + {0x0076, 0x3140}, + /* setup clock divider */ + {0x0003, 0x0050}, + /* jack detection configuration */ + {0x000D, 0x00E0}, + {0x000F, 0x0801}, + {0x0012, 0x0010}, + /* keypad detection configuration */ + {0x0013, 0x0280}, + {0x0014, 0x7310}, + {0x0015, 0x050E}, + {0x0016, 0x1B2A}, + /* audio format configuration */ + {0x001A, 0x0800}, + {0x001C, 0x000E}, + {0x001D, 0x0010}, + /* sampling rate control */ + {0x002B, 0x0012}, + /* DAC sampling rate control */ + {0x002C, 0x0082}, + /* ADC and DAC mixer control */ + {0x0030, 0x00D2}, + {0x0033, 0x00CF}, + {0x0034, 0x02CF}, + /* DAC class-G control */ + {0x006A, 0x1003}, + {0x0050, 0x2007}, + /* ADC PGA control */ + {0x0072, 0x0260}, + /* DAC power down enabled */ + {0x0080, 0x03A0}, + /* enable DAC clock */ + {0x0073, 0x336C}, + /* enable MIC Bias */ + {0x0074, 0x5502}, + /* powerup output driver */ + {0x007F, 0x473C}, + {0x007F, 0x473F}, + /* DAC power down disabled */ + {0x0080, 0x00A0}, + /* adjust MIC Bias */ + {0x0066, 0x2060}, + {0x0066, 0x2060}, + {0x0066, 0x0060}, +}; + +static int nau8825_codec_probe(struct snd_soc_codec *codec) +{ + int i; + struct nau8825_priv *nau8825; + + nau8825 = snd_soc_codec_get_drvdata(codec); + nau8825->codec = codec; + /*writing initial register values to the codec*/ + for (i = 0; i < ARRAY_SIZE(nau8825_reg); i++) + snd_soc_write(codec, nau8825_reg[i].reg, nau8825_reg[i].def); + return 0; +} + +static int nau8825_codec_remove(struct snd_soc_codec *codec) +{ + struct nau8825_priv *nau8825 = snd_soc_codec_get_drvdata(codec); + + regmap_write(nau8825->regmap, NAU8825_RESET, 0); + regmap_write(nau8825->regmap, NAU8825_RESET, 1); + return 0; +} + +static struct snd_soc_codec_driver soc_codec_driver_nau8825 = { + .probe = nau8825_codec_probe, + .remove = nau8825_codec_remove, + .suspend = nau8825_codec_suspend, + .resume = nau8825_resume, + .set_bias_level = nau8825_set_bias_level, + .controls = nau8825_snd_controls, + .num_controls = ARRAY_SIZE(nau8825_snd_controls), + .dapm_widgets = nau8825_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(nau8825_dapm_widgets), + .dapm_routes = nau8825_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(nau8825_dapm_routes), +}; + +static bool nau8825_readable_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case NAU8825_RESET: + case NAU8825_ENA_CTRL: + case NAU8825_CLK_EN: + case NAU8825_CLK_DIVIDER: + case NAU8825_FL_1: + case NAU8825_FL_2: + case NAU8825_FL_3: + case NAU8825_FL_4: + case NAU8825_FL_5: + case NAU8825_FL_6: + case NAU8825_HEADSET_CTRL: + case NAU8825_JACK_DET_CTRL: + case NAU8825_IRQ_SETTING_1: + case NAU8825_IRQ_STATUS: + case NAU8825_IRQ_CLEAR: + case NAU8825_IRQ_SETTING: + case NAU8825_SAR_ADC: + case NAU8825_VDET_COEFFICIENT: + case NAU8825_VDET_THRESHOLD_1: + case NAU8825_VDET_THRESHOLD_2: + case NAU8825_GPIO2_CTRL: + case NAU8825_I2S_PCM_CTRL_1: + case NAU8825_I2S_PCM_CTRL_2: + case NAU8825_ADC_RATE: + case NAU8825_DAC_CTRL1: + case NAU8825_DAC_CTRL2: + case NAU8825_ADC_DGAIN_CTRL: + case NAU8825_DAC_MUTE_CTRL: + case NAU8825_HSVOL_CTRL: + case NAU8825_DACL_CTRL: + case NAU8825_DACR_CTRL: + case NAU8825_SAR_ADC_OUTPUT: + case NAU8825_ANALOG_CTRL2: + case NAU8825_ANALOG_ADC_1: + case NAU8825_ANALOG_ADC_2: + case NAU8825_DAC_CTRL: + case NAU8825_MIC_BIAS: + case NAU8825_BOOST: + case NAU8825_CLASS_G_CTRL: + case NAU8825_BIAS_ADJ: + case NAU8825_POWER_UP_CTRL: + case NAU8825_CHARGE_BUMP: + return true; + default: + return false; + } +} + +static bool nau8825_volatile_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case NAU8825_RESET: + case NAU8825_ENA_CTRL: + case NAU8825_CLK_EN: + case NAU8825_CLK_DIVIDER: + case NAU8825_FL_1: + case NAU8825_FL_2: + case NAU8825_FL_3: + case NAU8825_FL_4: + case NAU8825_FL_5: + case NAU8825_FL_6: + case NAU8825_HEADSET_CTRL: + case NAU8825_JACK_DET_CTRL: + case NAU8825_IRQ_SETTING_1: + case NAU8825_IRQ_STATUS: + case NAU8825_IRQ_CLEAR: + case NAU8825_IRQ_SETTING: + case NAU8825_SAR_ADC: + case NAU8825_VDET_COEFFICIENT: + case NAU8825_VDET_THRESHOLD_1: + case NAU8825_VDET_THRESHOLD_2: + case NAU8825_GPIO2_CTRL: + case NAU8825_I2S_PCM_CTRL_1: + case NAU8825_I2S_PCM_CTRL_2: + case NAU8825_ADC_RATE: + case NAU8825_DAC_CTRL1: + case NAU8825_DAC_CTRL2: + case NAU8825_ADC_DGAIN_CTRL: + case NAU8825_DAC_MUTE_CTRL: + case NAU8825_HSVOL_CTRL: + case NAU8825_DACL_CTRL: + case NAU8825_DACR_CTRL: + case NAU8825_SAR_ADC_OUTPUT: + case NAU8825_ANALOG_CTRL2: + case NAU8825_ANALOG_ADC_1: + case NAU8825_ANALOG_ADC_2: + case NAU8825_DAC_CTRL: + case NAU8825_MIC_BIAS: + case NAU8825_BOOST: + case NAU8825_CLASS_G_CTRL: + case NAU8825_BIAS_ADJ: + case NAU8825_POWER_UP_CTRL: + case NAU8825_CHARGE_BUMP: + return true; + default: + return false; + } +} + +static const struct regmap_config nau8825_regmap = { + .reg_bits = 16, + .val_bits = 16, + .use_single_rw = true, + .max_register = NAU8825_MAX_REGISTER, + .volatile_reg = nau8825_volatile_register, + .readable_reg = nau8825_readable_register, + .cache_type = REGCACHE_RBTREE, + .reg_defaults = nau8825_reg, + .num_reg_defaults = ARRAY_SIZE(nau8825_reg), +}; + +static struct snd_soc_dai_ops nau8825_dai_ops = { + .hw_params = nau8825_hw_params, + .set_sysclk = nau8825_dai_set_sysclk, + .set_fmt = nau8825_set_dai_fmt, + .digital_mute = nau8825_dac_mute, +}; + +static struct snd_soc_dai_driver nau8825_dai_driver[] = { + { + .name = "nau8825-aif1", + .playback = { + .stream_name = "AIF1 Playback", + .channels_min = 1, + .channels_max = 2, + .rates = NAU8825_RATES, + .formats = NAU8825_FORMATS, + }, + .capture = { + .stream_name = "AIF1 Capture", + .channels_min = 1, + .channels_max = 2, + .rates = NAU8825_RATES, + .formats = NAU8825_FORMATS, + }, + .ops = &nau8825_dai_ops, + } +}; + + +static int nau8825_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *i2c_id) +{ + struct nau8825_platform_data *pdata = dev_get_platdata(&i2c->dev); + struct nau8825_priv *nau8825; + int ret; + + nau8825 = devm_kzalloc(&i2c->dev, sizeof(struct nau8825_priv), + GFP_KERNEL); + if (nau8825 == NULL) + return -ENOMEM; + nau8825->i2c = i2c; + i2c_set_clientdata(i2c, nau8825); + if (pdata) + nau8825->pdata = *pdata; + nau8825->regmap = devm_regmap_init_i2c(i2c, &nau8825_regmap); + if (IS_ERR(nau8825->regmap)) { + ret = PTR_ERR(nau8825->regmap); + dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret); + goto err_enable; + } + ret = snd_soc_register_codec(&i2c->dev, &soc_codec_driver_nau8825, + nau8825_dai_driver, + ARRAY_SIZE(nau8825_dai_driver)); +err_enable: + return ret; +} + +static int nau8825_i2c_remove(struct i2c_client *i2c) +{ + snd_soc_unregister_codec(&i2c->dev); + return 0; +} + +static const struct i2c_device_id nau8825_i2c_id[] = { + {"nau8825", 0}, + { } +}; +MODULE_DEVICE_TABLE(i2c, nau8825_i2c_id); + +static const struct acpi_device_id nau8825_acpi_match[] = { + { "10508825", 0 }, + {}, +}; +MODULE_DEVICE_TABLE(acpi, nau8825_acpi_match); + +static struct i2c_driver nau8825_i2c_driver = { + .driver = { + .name = "nau8825", + .owner = THIS_MODULE, + .acpi_match_table = ACPI_PTR(nau8825_acpi_match), + }, + .probe = nau8825_i2c_probe, + .remove = (nau8825_i2c_remove), + .id_table = nau8825_i2c_id, +}; +module_i2c_driver(nau8825_i2c_driver); + +MODULE_DESCRIPTION("ASoC NAU8825 codec driver"); +MODULE_AUTHOR("Nuvoton"); +MODULE_LICENSE("GPL v2"); + + diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h new file mode 100644 index 0000000..b16d4d1 --- /dev/null +++ b/sound/soc/codecs/nau8825.h @@ -0,0 +1,150 @@ +/* + * linux/sound/soc/codecs/nau8825.h + * + * Copyright 2015 Nuvoton Technology Corp. + * Author: Meng-Huang Kuo <mhkuo(a)nuvoton.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef _NAU8825_H +#define _NAU8825_H + +#include <sound/nau8825_plat.h> + +#define NAU8825_RESET 0x00 +#define NAU8825_ENA_CTRL 0x01 +#define NAU8825_CLK_EN 0x02 +#define NAU8825_CLK_DIVIDER 0x03 +#define NAU8825_FL_1 0x04 +#define NAU8825_FL_2 0x05 +#define NAU8825_FL_3 0x06 +#define NAU8825_FL_4 0x07 +#define NAU8825_FL_5 0x08 +#define NAU8825_FL_6 0x09 +#define NAU8825_HEADSET_CTRL 0x0C +#define NAU8825_JACK_DET_CTRL 0x0D +#define NAU8825_IRQ_SETTING_1 0x0F +#define NAU8825_IRQ_STATUS 0x10 +#define NAU8825_IRQ_CLEAR 0x11 +#define NAU8825_IRQ_SETTING 0x12 +#define NAU8825_SAR_ADC 0x13 +#define NAU8825_VDET_COEFFICIENT 0x14 +#define NAU8825_VDET_THRESHOLD_1 0x15 +#define NAU8825_VDET_THRESHOLD_2 0x16 +#define NAU8825_GPIO2_CTRL 0x1A +#define NAU8825_I2S_PCM_CTRL_1 0x1C +#define NAU8825_I2S_PCM_CTRL_2 0x1D +#define NAU8825_ADC_RATE 0x2B +#define NAU8825_DAC_CTRL1 0x2C +#define NAU8825_DAC_CTRL2 0x2D +#define NAU8825_ADC_DGAIN_CTRL 0x30 +#define NAU8825_DAC_MUTE_CTRL 0x31 +#define NAU8825_HSVOL_CTRL 0x32 +#define NAU8825_DACL_CTRL 0x33 +#define NAU8825_DACR_CTRL 0x34 +#define NAU8825_CLASS_G_CTRL 0x50 +#define NAU8825_SAR_ADC_OUTPUT 0x59 +#define NAU8825_BIAS_ADJ 0x66 +#define NAU8825_ANALOG_CTRL2 0x6A +#define NAU8825_ANALOG_ADC_1 0x71 +#define NAU8825_ANALOG_ADC_2 0x72 +#define NAU8825_DAC_CTRL 0x73 +#define NAU8825_MIC_BIAS 0x74 +#define NAU8825_BOOST 0x76 +#define NAU8825_POWER_UP_CTRL 0x7F +#define NAU8825_CHARGE_BUMP 0x80 +#define NAU8825_MAX_REGISTER 0xFF + +/* reg. NAU8825_I2S_PCM_CTRL_1 (0x1C) */ +#define NAU8825_I2S_BP_MASK (0x1 << 7) +#define NAU8825_I2S_BP_INV (0x1 << 7) +#define NAU8825_I2S_PCMB_MASK (0x1 << 6) +#define NAU8825_I2S_PCMB_EN (0x1 << 6) +#define NAU8825_I2S_DL_MASK (0x3 << 2) +#define NAU8825_I2S_DF_MASK 0x3 +#define NAU8825_I2S_DF_RIGHT 0x0 +#define NAU8825_I2S_DF_LEFT 0x1 +#define NAU8825_I2S_DF_I2S 0x2 +#define NAU8825_I2S_DF_PCM_A 0x3 +#define NAU8825_I2S_DF_PCM_B 0x3 + +/* reg. NAU8825_I2S_PCM_CTRL_2 (0x1D) */ +#define NAU8825_I2S_MS_MASK (0x1 << 3) + +/* reg. NAU8825_ADC_DGAIN_CTRL (0x30) */ +#define NAU8825_ADC_DGAIN_SFT 0 + +/* reg. NAU8825_DAC_MUTE_CTRL (0x31) */ +#define NAU8825_SOFT_MUTE_MASK (0x1 << 13) +#define NAU8825_SOFT_MUTE_EN (0x1 << 13) +#define NAU8825_SOFT_MUTE_DIS (0x0 << 13) + +/* reg. NAU8825_HSVOL_CTRL (0x32) */ +#define NAU8825_R_MUTE (0x1 << 15) +#define NAU8825_R_MUTE_SFT 15 +#define NAU8825_L_MUTE (0x1 << 14) +#define NAU8825_L_MUTE_SFT 14 +#define NAU8825_L_HSVOL_SFT 6 +#define NAU8825_R_HSVOL_SFT 0 + +/* reg. NAU8825_CLASS_G_CTRL (0x50) */ +#define NAU8825_CLASS_G_RIGHT_SHIFT 2 +#define NAU8825_CLASS_G_LEFT_SHIFT 1 +#define NAU8825_CLASS_G_SHIFT 0 + +/* reg. NAU8825_BIAS_ADJ_2 (0x66) */ +#define NAU8825_VMID_MASK (0x1 << 6) +#define NAU8825_VMID_EN (0x1 << 6) +#define NAU8825_VMID_DIS (0x0 << 6) + +/* reg. NAU8825_DAC_CTRL (0x73) */ +#define NAU8825_DAC_R_SFT 13 +#define NAU8825_DAC_L_SFT 12 +#define NAU8825_DAC_CLK_R_SFT 9 +#define NAU8825_DAC_CLK_L_SFT 8 + +/* reg. NAU8825_BOOST (0x76) */ +#define NAU8825_G_BIAS_MASK (0x1 << 12) +#define NAU8825_G_BIAS_SFT 12 +#define NAU8825_G_BIAS_EN (0x1 << 12) +#define NAU8825_G_BIAS_DIS (0x0 << 12) + +/* Volume Rescale */ +#define NAU8825_VOL_RSCL_RANGE 0x36 +#define NAU8825_ADC_VOL_RSCL_RANGE 0x256 + +/* Data format */ +#define NAU8825_I2S_DL_16 (0x0 << 2) +#define NAU8825_I2S_DL_20 (0x1 << 2) +#define NAU8825_I2S_DL_24 (0x2 << 2) +#define NAU8825_I2S_DL_32 (0x3 << 2) + +enum { + NAU8825_INTERNALCLOCK = 0, + NAU8825_MCLK, +}; + +#define NAU8825_RATES SNDRV_PCM_RATE_8000_192000 +#define NAU8825_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE \ + | SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE) + +struct nau8825_priv { + struct snd_soc_codec *codec; + struct nau8825_platform_data pdata; + struct regmap *regmap; + struct i2c_client *i2c; + struct snd_soc_jack *hp_jack; + struct snd_soc_jack *mic_jack; + struct delayed_work delayed_work; + + struct workqueue_struct *workqueue; + struct mutex mutex; + unsigned int irq; + bool jd_status; + bool bp_status; + int jack_type; +}; +#endif /* _NAU8825_H */ -- 1.9.3 --- Avast 防毒軟體已檢查此封電子郵件的病毒。 http://www.avast.com

2 2

Re: [alsa-devel] parallel, real time safe waiting?
by Johannes Lorenz 15 Apr '15

15 Apr '15

> Of course. Not only does this page say so: > http://www.alsa-project.org/main/index.php/SMP_Design Ah, I read this, but that's probably just if two threads would share one handle: "The use of returned handles must be serialized in the application using own locking scheme." One more question: You said snd_pcm_wait() was real time safe. I guess that's also true for similar functions, like snd_pcm_htimestamp(), snd_pcm_readi(), ..., correct?

2 1

[alsa-devel] recording problem in beagleboard-mcbsp
by noman pouigt 15 Apr '15

15 Apr '15

Problem: not able to record with any of the devices in beagleboard-xm. Analysis: userspace is stuck in snd_pcm_readi function and kernel space i don't see snd_pcm_update_hw_ptr function being called. Checked the I2S clocks and they are perfect and recording data line is moving based on the data. I am able to do playback though. I am using below command to do recording. Do i need to add additional switches? Linux kernel: 3.19 root@arm:~# arecord -t wav -c 2 -r 44100 -f S32_LE -v test.wav Recording WAVE 'test.wav' : Signed 32 bit Little Endian, Rate 44100 Hz, Stereo Plug PCM: Linear conversion PCM (S16_LE) Its setup is: stream : CAPTURE access : RW_INTERLEAVED format : S32_LE subformat : STD channels : 2 rate : 44100 exact rate : 44100 (44100/1) msbits : 32 buffer_size : 27560 period_size : 5512 period_time : 124988 tstamp_mode : NONE period_step : 1 avail_min : 5512 period_event : 0 start_threshold : 1 stop_threshold : 27560 silence_threshold: 0 silence_size : 0 boundary : 1806172160 Slave: Hardware PCM card 0 'omap3beagle' device 0 subdevice 0 Its setup is: stream : CAPTURE access : MMAP_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 44100 exact rate : 44100 (44100/1) msbits : 16 buffer_size : 27560 period_size : 5512 period_time : 124988 tstamp_mode : NONE period_step : 1 avail_min : 5512 period_event : 0 start_threshold : 1 stop_threshold : 27560 silence_threshold: 0 silence_size : 0 boundary : 1806172160 appl_ptr : 0 hw_ptr : 0 [ 74.696319] omap-mcbsp 48074000.mcbsp: **** McBSP255 regs **** [ 74.696380] omap-mcbsp 48074000.mcbsp: DRR2: 0xedd0abce [ 74.696411] omap-mcbsp 48074000.mcbsp: DRR1: 0x0000 [ 74.696441] omap-mcbsp 48074000.mcbsp: DXR2: 0x0000 [ 74.696472] omap-mcbsp 48074000.mcbsp: DXR1: 0x0000 [ 74.696502] omap-mcbsp 48074000.mcbsp: SPCR2: 0x0230 [ 74.696533] omap-mcbsp 48074000.mcbsp: SPCR1: 0x0031 [ 74.696563] omap-mcbsp 48074000.mcbsp: RCR2: 0x8041 [ 74.696594] omap-mcbsp 48074000.mcbsp: RCR1: 0x0040 [ 74.696594] omap-mcbsp 48074000.mcbsp: XCR2: 0x8041 [ 74.696624] omap-mcbsp 48074000.mcbsp: XCR1: 0x0040 [ 74.696655] omap-mcbsp 48074000.mcbsp: SRGR2: 0x001f [ 74.696685] omap-mcbsp 48074000.mcbsp: SRGR1: 0x0f00 [ 74.696716] omap-mcbsp 48074000.mcbsp: PCR0: 0x000f setup: beagleoboard-xm ubuntu distribution arecord used jaroslav recording application also tried

3 24

Re: [alsa-devel] Playback - Overwrite buffer with silence
by Nilhcraiv 15 Apr '15

15 Apr '15

Clemens wrote: It is impossible for the boundar to be zero. In my code snd_pcm_sw_params_get_boundary(swparams, &boundary) function does not return a negative value and the boundary variable is set to zero then, the boundar is zero. In any case, How I can put silence in buffer to avoid underrun? Do you know the answer? Thank you in advance.

3 4

Re: [alsa-devel] [PATCH 1/1] ASoC: fsl_sai: Add missing MODULE_DEVICE_TABLE
by Nicolin Chen 15 Apr '15

15 Apr '15

On Tue, Apr 14, 2015 at 11:33:27AM +0200, Alexander Stein wrote: > This enables module auto-loading when using device tree. > > Signed-off-by: Alexander Stein <alexander.stein(a)systec-electronic.com> Acked-by: Nicolin Chen <nicoleotsuka(a)gmail.com> > --- > sound/soc/fsl/fsl_sai.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c > index ec79c3d..1fe9f5d 100644 > --- a/sound/soc/fsl/fsl_sai.c > +++ b/sound/soc/fsl/fsl_sai.c > @@ -673,6 +673,7 @@ static const struct of_device_id fsl_sai_ids[] = { > { .compatible = "fsl,imx6sx-sai", }, > { /* sentinel */ } > }; > +MODULE_DEVICE_TABLE(of, fsl_sai_ids); > > static struct platform_driver fsl_sai_driver = { > .probe = fsl_sai_probe, > -- > 2.0.5 >

1 0