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

[alsa-devel] [PATCH] ASoC: rt5645: Move irq request to rt5645_probe
by Nicolas Boichat 07 Jul '15

07 Jul '15

rt5645_jack_detect_work (the workqueue called by rt5645_irq), needs to access rt5645->codec. However, this field is only initialized in rt5645_probe. This can obviously lead to kernel panics. Fix that by moving the irq request from rt5645_i2c_probe to rt5645_probe. Also, fail if the IRQ cannot be requested, and move irq_free from rt5645_i2c_remove to rt5645_remove. Signed-off-by: Nicolas Boichat <drinkcat(a)chromium.org> --- sound/soc/codecs/rt5645.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 9ce311e..7f84f21 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3044,6 +3044,7 @@ static int rt5645_irq_detection(struct rt5645_priv *rt5645) static int rt5645_probe(struct snd_soc_codec *codec) { struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); + int ret; rt5645->codec = codec; @@ -3072,12 +3073,32 @@ static int rt5645_probe(struct snd_soc_codec *codec) snd_soc_dapm_sync(&codec->dapm); } + INIT_DELAYED_WORK(&rt5645->jack_detect_work, rt5645_jack_detect_work); + + if (rt5645->i2c->irq) { + ret = request_threaded_irq(rt5645->i2c->irq, NULL, rt5645_irq, + IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING + | IRQF_ONESHOT, "rt5645", rt5645); + if (ret) { + dev_err(codec->dev, "Failed to request IRQ: %d\n", ret); + return ret; + } + } + return 0; } static int rt5645_remove(struct snd_soc_codec *codec) { + struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); + + if (rt5645->i2c->irq) + free_irq(rt5645->i2c->irq, rt5645); + + cancel_delayed_work_sync(&rt5645->jack_detect_work); + rt5645_reset(codec); + return 0; } @@ -3428,29 +3449,12 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, } } - INIT_DELAYED_WORK(&rt5645->jack_detect_work, rt5645_jack_detect_work); - - if (rt5645->i2c->irq) { - ret = request_threaded_irq(rt5645->i2c->irq, NULL, rt5645_irq, - IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING - | IRQF_ONESHOT, "rt5645", rt5645); - if (ret) - dev_err(&i2c->dev, "Failed to reguest IRQ: %d\n", ret); - } - return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5645, rt5645_dai, ARRAY_SIZE(rt5645_dai)); } static int rt5645_i2c_remove(struct i2c_client *i2c) { - struct rt5645_priv *rt5645 = i2c_get_clientdata(i2c); - - if (i2c->irq) - free_irq(i2c->irq, rt5645); - - cancel_delayed_work_sync(&rt5645->jack_detect_work); - snd_soc_unregister_codec(&i2c->dev); return 0; -- 2.4.3.573.g4eafbef

2 1

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

07 Jul '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> --- v2->v1: - fixes according to Lars-Peter Clausen's review comments - removes unused platform data file - corrects the naming of DAPM input widget - fixes some wrong coding of SOC widgets and other codes - adds definition and remark for config FLL clock - moves the code of reset hardware registers from codec_probe() to i2c_probe() - removes unused codes sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/nau8825.c | 563 +++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/nau8825.h | 170 ++++++++++++++ 4 files changed, 740 insertions(+) create mode 100644 sound/soc/codecs/nau8825.c create mode 100644 sound/soc/codecs/nau8825.h diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 061c465..ad7e205 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -76,6 +76,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 @@ -468,6 +469,10 @@ config SND_SOC_MAX98925 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 abe2d7e..9663e1c 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -69,6 +69,7 @@ snd-soc-max98925-objs := max98925.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 @@ -254,6 +255,7 @@ obj-$(CONFIG_SND_SOC_MAX98925) += snd-soc-max98925.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..f19c117 --- /dev/null +++ b/sound/soc/codecs/nau8825.c @@ -0,0 +1,563 @@ +/* + * 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 const DECLARE_TLV_DB_SCALE(out_hp_vol_tlv, -5400, 100, 0); +static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -10350, 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), +}; + +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[] = { + + /* Input */ + SND_SOC_DAPM_INPUT("MIC"), + SND_SOC_DAPM_SUPPLY("MIC BIAS", NAU8825_BOOST, NAU8825_G_BIAS_SFT, 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("DAC L1", NULL, NAU8825_DAC_CTRL, + NAU8825_DAC_L_SFT, 0), + SND_SOC_DAPM_DAC("DAC R1", NULL, NAU8825_DAC_CTRL, + NAU8825_DAC_R_SFT, 0), + /* 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_SUPPLY("HP amp", NAU8825_CLASS_G_CTRL, + NAU8825_CLASS_G_SHIFT, 0, NULL, 0), + /* Output */ + SND_SOC_DAPM_OUTPUT("HPOL"), + SND_SOC_DAPM_OUTPUT("HPOR"), +}; + +static const struct snd_soc_dapm_route nau8825_dapm_routes[] = { + + {"AIF1TX", NULL, "MIC"}, + {"DAC L1", NULL, "AIF1RX"}, + {"DAC R1", NULL, "AIF1RX"}, + {"HPO MIX", "HP L Switch", "DAC L1"}, + {"HPO MIX", "HP R Switch", "DAC R1"}, + {"HPOL", NULL, "HPO MIX"}, + {"HPOR", 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 *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct nau8825_priv *nau8825 = snd_soc_codec_get_drvdata(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; + } + regmap_update_bits(nau8825->regmap, 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; + struct nau8825_priv *nau8825 = snd_soc_codec_get_drvdata(codec); + + if (mute) + regmap_update_bits(nau8825->regmap, NAU8825_DAC_MUTE_CTRL, + NAU8825_SOFT_MUTE_MASK, NAU8825_SOFT_MUTE_EN); + else + regmap_update_bits(nau8825->regmap, 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; + struct nau8825_priv *nau8825 = snd_soc_codec_get_drvdata(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; + } + regmap_update_bits(nau8825->regmap, 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) +{ + struct nau8825_priv *nau8825 = snd_soc_codec_get_drvdata(codec); + + regmap_update_bits(nau8825->regmap, NAU8825_CLK_DIVIDER, + NAU8825_CLK_MCLK_SRC_MASK, 0x0003); + regmap_update_bits(nau8825->regmap, NAU8825_FLL_1, + NAU8825_FLL_RATIO_MASK, 0x0001); + /* FLL 16-bit fractional input */ + regmap_write(nau8825->regmap, NAU8825_FLL_2, 0xC49B); + /* FLL 10-bit integer input */ + regmap_update_bits(nau8825->regmap, NAU8825_FLL_3, + NAU8825_FLL_INTEGER_MASK, 0x0020); + /* FLL pre-scaler */ + regmap_update_bits(nau8825->regmap, NAU8825_FLL_4, + NAU8825_FLL_REF_DIV_MASK, 0x0800); + /* select divied VCO input */ + regmap_update_bits(nau8825->regmap, NAU8825_FLL_5, + NAU8825_FLL_FILTER_SW_MASK, 0x0000); + /* FLL sigma delta modulator enable */ + regmap_update_bits(nau8825->regmap, NAU8825_FLL_6, + NAU8825_SDM_EN_MASK, 0x4000); +} + +static void set_sys_clk(struct snd_soc_codec *codec, int sys_clk) +{ + struct nau8825_priv *nau8825 = snd_soc_codec_get_drvdata(codec); + + pr_debug("%s :: sys_clk=%x\n", __func__, sys_clk); + switch (sys_clk) { + case NAU8825_INTERNALCLOCK: + regmap_update_bits(nau8825->regmap, NAU8825_CLK_DIVIDER, + NAU8825_SYSCLK_EN_MASK, NAU8825_SYSCLK_DIS); + regmap_update_bits(nau8825->regmap, NAU8825_FLL_6, + NAU8825_DCO_EN_MASK, NAU8825_DCO_EN); + regmap_update_bits(nau8825->regmap, NAU8825_CLK_DIVIDER, + NAU8825_SYSCLK_EN_MASK, NAU8825_SYSCLK_EN); + break; + case NAU8825_MCLK: + default: + regmap_update_bits(nau8825->regmap, NAU8825_CLK_DIVIDER, + NAU8825_SYSCLK_EN_MASK, NAU8825_SYSCLK_DIS); + regmap_update_bits(nau8825->regmap, NAU8825_FLL_6, + NAU8825_DCO_EN_MASK, NAU8825_DCO_DIS); + regmap_update_bits(nau8825->regmap, NAU8825_CLK_DIVIDER, + NAU8825_SYSCLK_EN_MASK, NAU8825_SYSCLK_EN); + 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) +{ + struct nau8825_priv *nau8825 = snd_soc_codec_get_drvdata(codec); + + 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"); + regmap_update_bits(nau8825->regmap, NAU8825_BIAS_ADJ, + NAU8825_VMID_MASK, NAU8825_VMID_EN); + regmap_update_bits(nau8825->regmap, 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); + regmap_update_bits(nau8825->regmap, NAU8825_BIAS_ADJ, + NAU8825_VMID_MASK, NAU8825_VMID_DIS); + regmap_update_bits(nau8825->regmap, 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 const struct reg_default nau8825_reg[] = { + /* enable clock source */ + {0x0001, 0x07FF}, + /* enable VMID and Bias */ + {0x0076, 0x3140}, + /* setup clock divider */ + {0x0003, 0x0050}, + /* jack detection configuration */ + {0x000C, 0x0004}, + {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_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 const struct snd_soc_codec_driver soc_codec_driver_nau8825 = { + + .remove = nau8825_codec_remove, + .suspend_bias_off = true, + .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_FLL_1: + case NAU8825_FLL_2: + case NAU8825_FLL_3: + case NAU8825_FLL_4: + case NAU8825_FLL_5: + case NAU8825_FLL_6: + case NAU8825_HEADSET_CTRL: + case NAU8825_JACK_DET_CTRL: + case NAU8825_IRQ_MASK: + case NAU8825_IRQ_STATUS: + case NAU8825_IRQ_CLEAR: + case NAU8825_IRQ_CTRL: + 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_CTRL_2: + 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_CTRL: + case NAU8825_CHARGE_BUMP_RD: + case NAU8825_GENERAL_STATUS: + 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_FLL_1: + case NAU8825_FLL_2: + case NAU8825_FLL_3: + case NAU8825_FLL_4: + case NAU8825_FLL_5: + case NAU8825_FLL_6: + case NAU8825_HEADSET_CTRL: + case NAU8825_JACK_DET_CTRL: + case NAU8825_IRQ_MASK: + case NAU8825_IRQ_CLEAR: + case NAU8825_IRQ_CTRL: + 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_CTRL_2: + 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_CTRL: + 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 const 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_priv *nau8825; + int i, ret; + + nau8825 = devm_kzalloc(&i2c->dev, sizeof(*nau8825), + GFP_KERNEL); + if (nau8825 == NULL) + return -ENOMEM; + nau8825->i2c = i2c; + i2c_set_clientdata(i2c, nau8825); + 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; + } + /* software reset */ + regmap_write(nau8825->regmap, NAU8825_RESET, 0x01); + regmap_write(nau8825->regmap, NAU8825_RESET, 0x02); + /*writing initial register values to the codec*/ + for (i = 0; i < ARRAY_SIZE(nau8825_reg); i++) + regmap_write(nau8825->regmap, nau8825_reg[i].reg, + nau8825_reg[i].def); + + 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..8f22e39 --- /dev/null +++ b/sound/soc/codecs/nau8825.h @@ -0,0 +1,170 @@ +/* + * 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 + +#define NAU8825_RESET 0x00 +#define NAU8825_ENA_CTRL 0x01 +#define NAU8825_CLK_EN 0x02 +#define NAU8825_CLK_DIVIDER 0x03 +#define NAU8825_FLL_1 0x04 +#define NAU8825_FLL_2 0x05 +#define NAU8825_FLL_3 0x06 +#define NAU8825_FLL_4 0x07 +#define NAU8825_FLL_5 0x08 +#define NAU8825_FLL_6 0x09 +#define NAU8825_HEADSET_CTRL 0x0C +#define NAU8825_JACK_DET_CTRL 0x0D +#define NAU8825_IRQ_MASK 0x0F +#define NAU8825_IRQ_STATUS 0x10 +#define NAU8825_IRQ_CLEAR 0x11 +#define NAU8825_IRQ_CTRL 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_CTRL_2 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_CTRL 0x80 +#define NAU8825_CHARGE_BUMP_RD 0x81 +#define NAU8825_GENERAL_STATUS 0x82 +#define NAU8825_MAX_REGISTER 0xFF + +/* reg. NAU8825_CLK_DIVIDER (0x03) */ +#define NAU8825_SYSCLK_EN_MASK (0x1 << 15) +#define NAU8825_SYSCLK_EN (0x1 << 15) +#define NAU8825_SYSCLK_DIS (0x0 << 15) +#define NAU8825_CLK_MCLK_SRC_MASK (0xF << 0) + +/* reg. NAU8825_FLL_1 (0x04) */ +#define NAU8825_FLL_RATIO_MASK (0x7F << 0) + +/* reg. NAU8825_FLL_3 (0x06) */ +#define NAU8825_FLL_INTEGER_MASK (0x3FF << 0) + +/* reg. NAU8825_FLL_4 (0x07) */ +#define NAU8825_FLL_REF_DIV_MASK (0x3 << 10) + +/* reg. NAU8825_FLL_5 (0x08) */ +#define NAU8825_FLL_FILTER_SW_MASK (0x1 << 14) + +/* reg. NAU8825_FLL_6 (0x09) */ +#define NAU8825_DCO_EN_MASK (0x1 << 15) +#define NAU8825_DCO_EN (0x1 << 15) +#define NAU8825_DCO_DIS (0x0 << 15) +#define NAU8825_SDM_EN_MASK (0x1 << 14) + +/* 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_ANALOG_CTRL_2 (0x6A) */ +#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 0xFF + +/* 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 regmap *regmap; + struct i2c_client *i2c; + struct snd_soc_jack *jack; + struct delayed_work jack_detect_work; +}; +#endif /* _NAU8825_H */ -- 1.9.3

3 4

[alsa-devel] [PATCH 1/2] ASoC: rt286: Constify dmi_system_id table
by Axel Lin 06 Jul '15

06 Jul '15

dmi_check_system() takes "const struct dmi_system_id *", so make the dmi_system_id table const. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/rt286.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c index 5c43e26..382fedb 100644 --- a/sound/soc/codecs/rt286.c +++ b/sound/soc/codecs/rt286.c @@ -1108,7 +1108,7 @@ static const struct acpi_device_id rt286_acpi_match[] = { }; MODULE_DEVICE_TABLE(acpi, rt286_acpi_match); -static struct dmi_system_id force_combo_jack_table[] = { +static const struct dmi_system_id force_combo_jack_table[] = { { .ident = "Intel Wilson Beach", .matches = { @@ -1118,7 +1118,7 @@ static struct dmi_system_id force_combo_jack_table[] = { { } }; -static struct dmi_system_id dmi_dell_dino[] = { +static const struct dmi_system_id dmi_dell_dino[] = { { .ident = "Dell Dino", .matches = { -- 2.1.0

2 3

[alsa-devel] [PATCH] ALSA: oxygen: Fix S/PDIF muting
by Laurence Darby 05 Jul '15

05 Jul '15

The S/PDIF output was muted whenever audio wasn't playing which resulted in a clicking noise from the DAC when resuming (similar to the issue in 3bef1c377d1b (ALSA: hda - stop setup_dig_out_stream() causing clicks)). Also, the mixer control wasn't actually controlling the S/PDIF output. - Fix the initial state of the mixer to match the initial muted state. - Mute the output at shutdown. - Delete the code that modifies OXYGEN_SPDIF_OUT_ENABLE, and modify it only in oxygen_update_spdif_source(), so only the mixer control controls it. Signed-off-by: Laurence Darby <ldarby(a)tuffmail.com> --- Patch is against master, tested on 4.0. sound/pci/oxygen/oxygen_lib.c | 5 ++++- sound/pci/oxygen/oxygen_mixer.c | 9 +++++---- sound/pci/oxygen/oxygen_pcm.c | 15 +-------------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index b4ef580..2cca908 100644 --- a/sound/pci/oxygen/oxygen_lib.c +++ b/sound/pci/oxygen/oxygen_lib.c @@ -373,7 +373,7 @@ static void oxygen_init(struct oxygen *chip) for (i = 0; i < 8; ++i) chip->dac_volume[i] = chip->model.dac_volume_min; chip->dac_mute = 1; - chip->spdif_playback_enable = 1; + chip->spdif_playback_enable = 0; chip->spdif_bits = OXYGEN_SPDIF_C | OXYGEN_SPDIF_ORIGINAL | (IEC958_AES1_CON_PCM_CODER << OXYGEN_SPDIF_CATEGORY_SHIFT); chip->spdif_pcm_bits = chip->spdif_bits; @@ -575,6 +575,9 @@ static void oxygen_shutdown(struct oxygen *chip) spin_lock_irq(&chip->reg_lock); chip->interrupt_mask = 0; chip->pcm_running = 0; + chip->spdif_playback_enable = 0; + oxygen_clear_bits32(chip, OXYGEN_SPDIF_CONTROL, + OXYGEN_SPDIF_OUT_ENABLE); oxygen_write16(chip, OXYGEN_DMA_STATUS, 0); oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, 0); spin_unlock_irq(&chip->reg_lock); diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index 6492bca..20a2781 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c @@ -252,7 +252,6 @@ void oxygen_update_spdif_source(struct oxygen *chip) old_control = oxygen_read32(chip, OXYGEN_SPDIF_CONTROL); old_routing = oxygen_read16(chip, OXYGEN_PLAY_ROUTING); if (chip->pcm_active & (1 << PCM_SPDIF)) { - new_control = old_control | OXYGEN_SPDIF_OUT_ENABLE; new_routing = (old_routing & ~OXYGEN_PLAY_SPDIF_MASK) | OXYGEN_PLAY_SPDIF_SPDIF; oxygen_rate = (old_control >> OXYGEN_SPDIF_OUT_RATE_SHIFT) @@ -265,13 +264,15 @@ void oxygen_update_spdif_source(struct oxygen *chip) oxygen_rate = oxygen_read16(chip, OXYGEN_I2S_MULTICH_FORMAT) & OXYGEN_I2S_RATE_MASK; new_control = (old_control & ~OXYGEN_SPDIF_OUT_RATE_MASK) | - (oxygen_rate << OXYGEN_SPDIF_OUT_RATE_SHIFT) | - OXYGEN_SPDIF_OUT_ENABLE; + (oxygen_rate << OXYGEN_SPDIF_OUT_RATE_SHIFT); } else { - new_control = old_control & ~OXYGEN_SPDIF_OUT_ENABLE; new_routing = old_routing; oxygen_rate = OXYGEN_RATE_44100; } + if (chip->spdif_playback_enable) + new_control = old_control | OXYGEN_SPDIF_OUT_ENABLE; + else + new_control = old_control & ~OXYGEN_SPDIF_OUT_ENABLE; if (old_routing != new_routing) { oxygen_write32(chip, OXYGEN_SPDIF_CONTROL, new_control & ~OXYGEN_SPDIF_OUT_ENABLE); diff --git a/sound/pci/oxygen/oxygen_pcm.c b/sound/pci/oxygen/oxygen_pcm.c index aa2ebd1..f4a4a48 100644 --- a/sound/pci/oxygen/oxygen_pcm.c +++ b/sound/pci/oxygen/oxygen_pcm.c @@ -477,8 +477,6 @@ static int oxygen_spdif_hw_params(struct snd_pcm_substream *substream, mutex_lock(&chip->mutex); spin_lock_irq(&chip->reg_lock); - oxygen_clear_bits32(chip, OXYGEN_SPDIF_CONTROL, - OXYGEN_SPDIF_OUT_ENABLE); oxygen_write8_masked(chip, OXYGEN_PLAY_FORMAT, oxygen_format(hw_params) << OXYGEN_SPDIF_FORMAT_SHIFT, OXYGEN_SPDIF_FORMAT_MASK); @@ -544,17 +542,6 @@ static int oxygen_hw_free(struct snd_pcm_substream *substream) return snd_pcm_lib_free_pages(substream); } -static int oxygen_spdif_hw_free(struct snd_pcm_substream *substream) -{ - struct oxygen *chip = snd_pcm_substream_chip(substream); - - spin_lock_irq(&chip->reg_lock); - oxygen_clear_bits32(chip, OXYGEN_SPDIF_CONTROL, - OXYGEN_SPDIF_OUT_ENABLE); - spin_unlock_irq(&chip->reg_lock); - return oxygen_hw_free(substream); -} - static int oxygen_prepare(struct snd_pcm_substream *substream) { struct oxygen *chip = snd_pcm_substream_chip(substream); @@ -669,7 +656,7 @@ static struct snd_pcm_ops oxygen_spdif_ops = { .close = oxygen_close, .ioctl = snd_pcm_lib_ioctl, .hw_params = oxygen_spdif_hw_params, - .hw_free = oxygen_spdif_hw_free, + .hw_free = oxygen_hw_free, .prepare = oxygen_prepare, .trigger = oxygen_trigger, .pointer = oxygen_pointer, -- 2.3.5

2 5

[alsa-devel] [PATCH 1/6] ASoC: rt286: Prefix hexadecimal ID register value with 0x in error print
by Jarkko Nikula 03 Jul '15

03 Jul '15

Make it obvious that unexpected value read from ID register is printed in hexadecimal. Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> --- sound/soc/codecs/rt286.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c index 5c43e263b2c1..2f39843ebd14 100644 --- a/sound/soc/codecs/rt286.c +++ b/sound/soc/codecs/rt286.c @@ -1157,7 +1157,7 @@ static int rt286_i2c_probe(struct i2c_client *i2c, } if (val != RT286_VENDOR_ID && val != RT288_VENDOR_ID) { dev_err(&i2c->dev, - "Device with ID register %x is not rt286\n", val); + "Device with ID register %#x is not rt286\n", val); return -ENODEV; } -- 2.1.4

2 11

[alsa-devel] [PATCH 0/6] Remove redundant spi driver bus initialization
by Antonio Borneo 03 Jul '15

03 Jul '15

This cleanup was already completed between end 2011 and early 2012 with a patch series from Lars-Peter Clausen: https://lkml.org/lkml/2011/11/24/190 Later on new redundant initialization re-appeared here and there. Time to cleanup again. And, yes, I'm lazy! I copy-paste the exact same commit message from Lars-Peter; only minor reformat to stay in 75 char/line and fix the name of spi_register_driver(). Regards, Antonio Antonio Borneo (6): ASoC: wm0010: Remove redundant spi driver bus initialization iio: ssp_sensors: Remove redundant spi driver bus initialization staging: mt29f_spinand: Remove redundant spi driver bus initialization net: ieee802154: Remove redundant spi driver bus initialization wireless: cw1200: Remove redundant spi driver bus initialization [media] s5c73m3: Remove redundant spi driver bus initialization drivers/iio/common/ssp_sensors/ssp_dev.c | 1 - drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 1 - drivers/net/ieee802154/cc2520.c | 1 - drivers/net/ieee802154/mrf24j40.c | 1 - drivers/net/wireless/cw1200/cw1200_spi.c | 1 - drivers/staging/mt29f_spinand/mt29f_spinand.c | 1 - sound/soc/codecs/wm0010.c | 1 - 7 files changed, 7 deletions(-) -- 2.4.4

3 3

Re: [alsa-devel] Intel Baytrail Linux Audio
by Vinod Koul 03 Jul '15

03 Jul '15

On Tue, Jun 23, 2015 at 05:31:17PM -0400, Tyler Yeomans wrote: > Hello Vinod, Pls cc relevant mailing list, in this case alsa. I have cced Liam and Jarrko as well > > I am writing to you because unfortunately I have exhausted my search > and I am unable to get ALSA sound working on my Baytrail minipc. > My dmesg only reports that: byt-rt5640 byt-rt5640: ASoC: CPU DAI > baytrail-pcm-audio not registered > aplay -l rightfully says there are no sound cards as the driver is > not registered. Can you give more details of your, does this enable HDA audio or I2S audio? > I have acquired the firmware file from the chromium repo here (https://kernel.googlesource.com/pub/scm/linux/kernel/git/firmware/linux-fir…) > as was directed by the OP in this forum post: > http://ubuntuforums.org/showthread.php?t=2254631 > > But unfortunately it seems the driver is still not loading > correctly, even on Ubuntu 15.04 with ALSA 1.0.28 Do you have dmesg for us to look at so that we can see what might be going wrong > I see on gmane you are working on Skylake driver, could your work > there possibly be backported to the Baytrail/RT5640 chipset? No they are entirely different hw, so it will not work. We have uostream BYT driver and they should work -- ~Vinod

6 12

Re: [alsa-devel] [Intel-gfx] [PATCH 3/4] snd: add support for displayport multi-stream to hda codec.
by Dave Airlie 03 Jul '15

03 Jul '15

On 19 June 2015 at 19:54, Lin, Mengdong <mengdong.lin(a)intel.com> wrote: > Hi Takashi/Dave, > > Shall we move or cc this discussion on audio driver side to ALSA ML? Oops I thought I had cc'ed these patches to alsa-devel as well when I sent them. > I think we also need to decide how to manage PCM devices for DP MST. > Now the HD-A driver create a PCM device for each pin, and the substream > number is 1 for each PCM. Now with DP MST enabled, each pin can support > multiple streams (e.g. 3 on Intel HSW/BDW/SKL). > > There may be 2 options: > -#1: Let an HDMI codec specify number of substreams, same as the number > of device entries on a pin. We can specify 3 for HSW/BDW/SKL. Other > vendors can also specify a value according to actual HW capabilities. > > So for HSW, we have 3x3 subtreams totally. But we only have 3 convertors > (for 3 display pipelines), so we can open up to 3 substreams at the same > time. When the audio driver finds all 3 convertors are used when opening > a new substream, it will fail. One thing I noticed is the number of devices on a PIN is only updated when the MST device is plugged in so normally pins 5,6,7 have 0 devices, and when I plug in MST device, I get the 3 devices on port 6. So it seems dynamic enough at this point, though I guess it'll always be 0 or 3. > > - #2: Create PCM device dynamically. Only create a PCM devices for a device > entry which connects to monitor with audio support. When the monitor > is removed, the PCM device will be disconnected, closed and removed, > similar to the USB case. > > This will change ALSA core. But there will be less PCM devices and > substreams, since the number of connected monitors Is decided by the > actual GPU display pipeline. I like this option more, since I think it should be more like USB, but I've no idea how much work it would be from the alsa side, this patch was probably as deep into alsa as I've gone. Dave. >> Signed-off-by: Dave Airlie <airlied(a)redhat.com> >> --- >> include/sound/hda_verbs.h | 2 + >> sound/pci/hda/hda_codec.c | 1 + >> sound/pci/hda/hda_proc.c | 5 +- >> sound/pci/hda/patch_hdmi.c | 181 >> +++++++++++++++++++++++++++++++-------------- >> 4 files changed, 131 insertions(+), 58 deletions(-) >> >> diff --git a/include/sound/hda_verbs.h b/include/sound/hda_verbs.h index >> d0509db..3b62ac5 100644 >> --- a/include/sound/hda_verbs.h >> +++ b/include/sound/hda_verbs.h >> @@ -75,6 +75,7 @@ enum { >> #define AC_VERB_GET_HDMI_CHAN_SLOT 0x0f34 >> #define AC_VERB_GET_DEVICE_SEL 0xf35 >> #define AC_VERB_GET_DEVICE_LIST 0xf36 >> +#define AC_VERB_GET_DP_STREAM_ID 0xf3c >> >> /* >> * SET verbs >> @@ -115,6 +116,7 @@ enum { >> #define AC_VERB_SET_HDMI_CP_CTRL 0x733 >> #define AC_VERB_SET_HDMI_CHAN_SLOT 0x734 >> #define AC_VERB_SET_DEVICE_SEL 0x735 >> +#define AC_VERB_SET_DP_STREAM_ID 0x73C >> >> /* >> * Parameter IDs >> diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index >> 5645481..3981c63 100644 >> --- a/sound/pci/hda/hda_codec.c >> +++ b/sound/pci/hda/hda_codec.c >> @@ -482,6 +482,7 @@ int snd_hda_get_devices(struct hda_codec *codec, >> hda_nid_t nid, >> } >> return devices; >> } >> +EXPORT_SYMBOL_GPL(snd_hda_get_devices); >> >> /* >> * destructor >> diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index >> baaf7ed0..39fac53 100644 >> --- a/sound/pci/hda/hda_proc.c >> +++ b/sound/pci/hda/hda_proc.c >> @@ -644,10 +644,13 @@ static void print_device_list(struct snd_info_buffer >> *buffer, >> int i, curr = -1; >> u8 dev_list[AC_MAX_DEV_LIST_LEN]; >> int devlist_len; >> + int dp_s_id; >> >> + dp_s_id = snd_hda_codec_read(codec, nid, 0, >> + AC_VERB_GET_DP_STREAM_ID, 0); >> devlist_len = snd_hda_get_devices(codec, nid, dev_list, >> AC_MAX_DEV_LIST_LEN); >> - snd_iprintf(buffer, " Devices: %d\n", devlist_len); >> + snd_iprintf(buffer, " Devices: %d: 0x%x\n", devlist_len, dp_s_id); >> if (devlist_len <= 0) >> return; >> >> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index >> 5f44f60..8272656 100644 >> --- a/sound/pci/hda/patch_hdmi.c >> +++ b/sound/pci/hda/patch_hdmi.c >> @@ -68,6 +68,17 @@ struct hdmi_spec_per_cvt { >> /* max. connections to a widget */ >> #define HDA_MAX_CONNECTIONS 32 >> >> +struct hdmi_spec_per_pin; >> +#define HDA_MAX_DEVICES 3 >> +struct hdmi_spec_per_device { >> + struct hdmi_spec_per_pin *pin; >> + int device_idx; >> + struct hdmi_eld sink_eld; >> +#ifdef CONFIG_PROC_FS >> + struct snd_info_entry *proc_entry; >> +#endif >> +}; >> + >> struct hdmi_spec_per_pin { >> hda_nid_t pin_nid; >> int num_mux_nids; >> @@ -76,7 +87,11 @@ struct hdmi_spec_per_pin { >> hda_nid_t cvt_nid; >> >> struct hda_codec *codec; >> - struct hdmi_eld sink_eld; >> + >> + int num_devices; >> + u8 dev_list[AC_MAX_DEV_LIST_LEN]; >> + struct hdmi_spec_per_device devices[HDA_MAX_DEVICES]; >> + >> struct mutex lock; >> struct delayed_work work; >> struct snd_kcontrol *eld_ctl; >> @@ -86,9 +101,6 @@ struct hdmi_spec_per_pin { >> bool non_pcm; >> bool chmap_set; /* channel-map override by ALSA API? */ >> unsigned char chmap[8]; /* ALSA API channel-map */ -#ifdef >> CONFIG_PROC_FS >> - struct snd_info_entry *proc_entry; >> -#endif >> }; >> >> struct cea_channel_speaker_allocation; >> @@ -409,7 +421,7 @@ static int hdmi_eld_ctl_info(struct snd_kcontrol >> *kcontrol, >> >> pin_idx = kcontrol->private_value; >> per_pin = get_pin(spec, pin_idx); >> - eld = &per_pin->sink_eld; >> + eld = &per_pin->devices[0].sink_eld; >> >> mutex_lock(&per_pin->lock); >> uinfo->count = eld->eld_valid ? eld->eld_size : 0; @@ -429,7 +441,7 @@ >> static int hdmi_eld_ctl_get(struct snd_kcontrol *kcontrol, >> >> pin_idx = kcontrol->private_value; >> per_pin = get_pin(spec, pin_idx); >> - eld = &per_pin->sink_eld; >> + eld = &per_pin->devices[0].sink_eld; >> >> mutex_lock(&per_pin->lock); >> if (eld->eld_size > ARRAY_SIZE(ucontrol->value.bytes.data)) { @@ -549,60 >> +561,63 @@ static void hdmi_set_channel_count(struct hda_codec *codec, >> */ >> >> #ifdef CONFIG_PROC_FS >> -static void print_eld_info(struct snd_info_entry *entry, >> - struct snd_info_buffer *buffer) >> +static void print_eld_info_device(struct snd_info_entry *entry, >> + struct snd_info_buffer *buffer) >> { >> - struct hdmi_spec_per_pin *per_pin = entry->private_data; >> + struct hdmi_spec_per_device *per_device = entry->private_data; >> >> - mutex_lock(&per_pin->lock); >> - snd_hdmi_print_eld_info(&per_pin->sink_eld, buffer); >> - mutex_unlock(&per_pin->lock); >> + mutex_lock(&per_device->pin->lock); >> + snd_hdmi_print_eld_info(&per_device->sink_eld, buffer); >> + mutex_unlock(&per_device->pin->lock); >> } >> >> -static void write_eld_info(struct snd_info_entry *entry, >> - struct snd_info_buffer *buffer) >> +static void write_eld_info_device(struct snd_info_entry *entry, >> + struct snd_info_buffer *buffer) >> { >> - struct hdmi_spec_per_pin *per_pin = entry->private_data; >> + struct hdmi_spec_per_device *per_device = entry->private_data; >> >> - mutex_lock(&per_pin->lock); >> - snd_hdmi_write_eld_info(&per_pin->sink_eld, buffer); >> - mutex_unlock(&per_pin->lock); >> + mutex_lock(&per_device->pin->lock); >> + snd_hdmi_write_eld_info(&per_device->sink_eld, buffer); >> + mutex_unlock(&per_device->pin->lock); >> } >> >> -static int eld_proc_new(struct hdmi_spec_per_pin *per_pin, int index) >> +static int eld_device_proc_new(struct hdmi_spec_per_device *per_device, >> +int pin_idx, int dev_idx) >> { >> char name[32]; >> - struct hda_codec *codec = per_pin->codec; >> + struct hda_codec *codec = per_device->pin->codec; >> struct snd_info_entry *entry; >> int err; >> >> - snprintf(name, sizeof(name), "eld#%d.%d", codec->addr, index); >> + if (dev_idx == -1) >> + snprintf(name, sizeof(name), "eld#%d.%d", codec->addr, pin_idx); >> + else >> + snprintf(name, sizeof(name), "eld#%d.%d.%d", codec->addr, >> pin_idx, >> +dev_idx); >> err = snd_card_proc_new(codec->card, name, &entry); >> if (err < 0) >> return err; >> >> - snd_info_set_text_ops(entry, per_pin, print_eld_info); >> - entry->c.text.write = write_eld_info; >> + snd_info_set_text_ops(entry, per_device, print_eld_info_device); >> + entry->c.text.write = write_eld_info_device; >> entry->mode |= S_IWUSR; >> - per_pin->proc_entry = entry; >> + per_device->proc_entry = entry; >> >> return 0; >> } >> >> -static void eld_proc_free(struct hdmi_spec_per_pin *per_pin) >> +static void eld_device_proc_free(struct hdmi_spec_per_device >> +*per_device) >> { >> - if (!per_pin->codec->bus->shutdown && per_pin->proc_entry) { >> - snd_device_free(per_pin->codec->card, per_pin->proc_entry); >> - per_pin->proc_entry = NULL; >> + if (!per_device->pin->codec->bus->shutdown && per_device->proc_entry) >> { >> + snd_device_free(per_device->pin->codec->card, >> per_device->proc_entry); >> + per_device->proc_entry = NULL; >> } >> } >> #else >> -static inline int eld_proc_new(struct hdmi_spec_per_pin *per_pin, >> - int index) >> +static inline int eld_device_proc_new(struct hdmi_spec_per_device >> *per_device, >> + int pin_idx, int dev_idx) >> { >> return 0; >> } >> -static inline void eld_proc_free(struct hdmi_spec_per_pin *per_pin) >> +static inline void eld_device_proc_free(struct hdmi_spec_per_device >> +*per_device) >> { >> } >> #endif >> @@ -1112,13 +1127,13 @@ static void hdmi_pin_setup_infoframe(struct >> hda_codec *codec, >> >> static void hdmi_setup_audio_infoframe(struct hda_codec *codec, >> struct hdmi_spec_per_pin *per_pin, >> + struct hdmi_eld *eld, >> bool non_pcm) >> { >> struct hdmi_spec *spec = codec->spec; >> hda_nid_t pin_nid = per_pin->pin_nid; >> int channels = per_pin->channels; >> int active_channels; >> - struct hdmi_eld *eld; >> int ca, ordered_ca; >> >> if (!channels) >> @@ -1129,7 +1144,8 @@ static void hdmi_setup_audio_infoframe(struct >> hda_codec *codec, >> AC_VERB_SET_AMP_GAIN_MUTE, >> AMP_OUT_UNMUTE); >> >> - eld = &per_pin->sink_eld; >> + if (!eld) >> + eld = &per_pin->devices[0].sink_eld; >> >> if (!non_pcm && per_pin->chmap_set) >> ca = hdmi_manual_channel_allocation(channels, per_pin->chmap); >> @@ -1191,7 +1207,7 @@ static void hdmi_intrinsic_event(struct hda_codec >> *codec, unsigned int res) >> return; >> jack->jack_dirty = 1; >> >> - codec_dbg(codec, >> + codec_info(codec, >> "HDMI hot plug event: Codec=%d Pin=%d Device=%d Inactive=%d >> Presence_Detect=%d ELD_Valid=%d\n", >> codec->addr, jack->nid, dev_entry, !!(res & AC_UNSOL_RES_IA), >> !!(res & AC_UNSOL_RES_PD), !!(res & AC_UNSOL_RES_ELDV)); @@ >> -1449,7 +1465,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream >> *hinfo, >> if (snd_BUG_ON(pin_idx < 0)) >> return -EINVAL; >> per_pin = get_pin(spec, pin_idx); >> - eld = &per_pin->sink_eld; >> + eld = &per_pin->devices[0].sink_eld; >> >> err = hdmi_choose_cvt(codec, pin_idx, &cvt_idx, &mux_idx); >> if (err < 0) >> @@ -1530,7 +1546,7 @@ static bool hdmi_present_sense(struct >> hdmi_spec_per_pin *per_pin, int repoll) >> struct hda_codec *codec = per_pin->codec; >> struct hdmi_spec *spec = codec->spec; >> struct hdmi_eld *eld = &spec->temp_eld; >> - struct hdmi_eld *pin_eld = &per_pin->sink_eld; >> + struct hdmi_eld *pin_eld; >> hda_nid_t pin_nid = per_pin->pin_nid; >> /* >> * Always execute a GetPinSense verb here, even when called from @@ >> -1544,20 +1560,41 @@ static bool hdmi_present_sense(struct >> hdmi_spec_per_pin *per_pin, int repoll) >> bool update_eld = false; >> bool eld_changed = false; >> bool ret; >> + int device_num = 0; >> + bool need_repoll = false; >> + bool any_eld_valid = false; >> >> snd_hda_power_up_pm(codec); >> present = snd_hda_pin_sense(codec, pin_nid); >> >> mutex_lock(&per_pin->lock); >> - pin_eld->monitor_present = !!(present & AC_PINSENSE_PRESENCE); >> - if (pin_eld->monitor_present) >> - eld->eld_valid = !!(present & AC_PINSENSE_ELDV); >> - else >> - eld->eld_valid = false; >> >> - codec_dbg(codec, >> - "HDMI status: Codec=%d Pin=%d Presence_Detect=%d >> ELD_Valid=%d\n", >> - codec->addr, pin_nid, pin_eld->monitor_present, eld->eld_valid); >> + if (codec->dp_mst) >> + per_pin->num_devices = snd_hda_get_devices(codec, pin_nid, >> per_pin->dev_list, >> + AC_MAX_DEV_LIST_LEN); >> +next_device: >> + pin_eld = &per_pin->devices[device_num].sink_eld; >> + eld_changed = false; >> + update_eld = false; >> + if (per_pin->num_devices) { >> + pin_eld->monitor_present = !!(per_pin->dev_list[device_num] & >> AC_DE_PD); >> + if (pin_eld->monitor_present) >> + eld->eld_valid = !!(per_pin->dev_list[device_num] & >> AC_DE_ELDV); >> + else >> + eld->eld_valid = false; >> + if (eld->eld_valid) >> + snd_hda_codec_write(codec, pin_nid, 0, >> AC_VERB_SET_DEVICE_SEL, device_num); >> + } else { >> + pin_eld->monitor_present = !!(present & AC_PINSENSE_PRESENCE); >> + if (pin_eld->monitor_present) >> + eld->eld_valid = !!(present & AC_PINSENSE_ELDV); >> + else >> + eld->eld_valid = false; >> + } >> + >> + codec_info(codec, >> + "HDMI status: Codec=%d Pin=%d Device=%d Presence_Detect=%d >> ELD_Valid=%d\n", >> + codec->addr, pin_nid, device_num, pin_eld->monitor_present, >> +eld->eld_valid); >> >> if (eld->eld_valid) { >> if (spec->ops.pin_get_eld(codec, pin_nid, eld->eld_buffer, @@ >> -1573,11 +1610,11 @@ static bool hdmi_present_sense(struct >> hdmi_spec_per_pin *per_pin, int repoll) >> if (eld->eld_valid) { >> snd_hdmi_show_eld(codec, &eld->info); >> update_eld = true; >> + any_eld_valid = true; >> } >> else if (repoll) { >> - schedule_delayed_work(&per_pin->work, >> - msecs_to_jiffies(300)); >> - goto unlock; >> + need_repoll = true; >> + goto skip_to_next_device; >> } >> } >> >> @@ -1614,7 +1651,7 @@ static bool hdmi_present_sense(struct >> hdmi_spec_per_pin *per_pin, int repoll) >> per_pin->mux_idx); >> } >> >> - hdmi_setup_audio_infoframe(codec, per_pin, >> + hdmi_setup_audio_infoframe(codec, per_pin, eld, >> per_pin->non_pcm); >> } >> } >> @@ -1623,8 +1660,19 @@ static bool hdmi_present_sense(struct >> hdmi_spec_per_pin *per_pin, int repoll) >> snd_ctl_notify(codec->card, >> SNDRV_CTL_EVENT_MASK_VALUE | >> SNDRV_CTL_EVENT_MASK_INFO, >> &per_pin->eld_ctl->id); >> - unlock: >> - ret = !repoll || !pin_eld->monitor_present || pin_eld->eld_valid; >> +skip_to_next_device: >> + if (codec->dp_mst) { >> + device_num++; >> + if (device_num < per_pin->num_devices) >> + goto next_device; >> + } >> + >> + if (need_repoll) { >> + schedule_delayed_work(&per_pin->work, >> + msecs_to_jiffies(300)); >> + repoll = true; >> + } >> + ret = !repoll || any_eld_valid; >> >> jack = snd_hda_jack_tbl_get(codec, pin_nid); >> if (jack) >> @@ -1807,7 +1855,7 @@ static int >> generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo, >> per_pin->channels = substream->runtime->channels; >> per_pin->setup = true; >> >> - hdmi_setup_audio_infoframe(codec, per_pin, non_pcm); >> + hdmi_setup_audio_infoframe(codec, per_pin, NULL, non_pcm); >> mutex_unlock(&per_pin->lock); >> >> if (spec->dyn_pin_out) { >> @@ -2035,7 +2083,7 @@ static int hdmi_chmap_ctl_put(struct snd_kcontrol >> *kcontrol, >> per_pin->chmap_set = true; >> memcpy(per_pin->chmap, chmap, sizeof(chmap)); >> if (prepared) >> - hdmi_setup_audio_infoframe(codec, per_pin, per_pin->non_pcm); >> + hdmi_setup_audio_infoframe(codec, per_pin, NULL, >> per_pin->non_pcm); >> mutex_unlock(&per_pin->lock); >> >> return 0; >> @@ -2147,7 +2195,7 @@ static int generic_hdmi_build_controls(struct >> hda_codec *codec) static int generic_hdmi_init_per_pins(struct hda_codec >> *codec) { >> struct hdmi_spec *spec = codec->spec; >> - int pin_idx; >> + int pin_idx, dev_idx; >> >> for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) { >> struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); @@ >> -2155,7 +2203,20 @@ static int generic_hdmi_init_per_pins(struct hda_codec >> *codec) >> per_pin->codec = codec; >> mutex_init(&per_pin->lock); >> INIT_DELAYED_WORK(&per_pin->work, hdmi_repoll_eld); >> - eld_proc_new(per_pin, pin_idx); >> + >> + if (codec->dp_mst) { >> + for (dev_idx = 0; dev_idx < HDA_MAX_DEVICES; dev_idx++) { >> + per_pin->devices[dev_idx].device_idx = dev_idx; >> + per_pin->devices[dev_idx].pin = per_pin; >> + >> + eld_device_proc_new(&per_pin->devices[dev_idx], pin_idx, >> dev_idx); >> + } >> + } else { >> + per_pin->num_devices = 0; >> + per_pin->devices[0].device_idx = 0; >> + per_pin->devices[0].pin = per_pin; >> + eld_device_proc_new(&per_pin->devices[0], pin_idx, -1); >> + } >> } >> return 0; >> } >> @@ -2191,13 +2252,19 @@ static void hdmi_array_free(struct hdmi_spec >> *spec) static void generic_hdmi_free(struct hda_codec *codec) { >> struct hdmi_spec *spec = codec->spec; >> - int pin_idx; >> + int pin_idx, dev_idx; >> >> for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) { >> struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); >> >> cancel_delayed_work_sync(&per_pin->work); >> - eld_proc_free(per_pin); >> + if (per_pin->num_devices) { >> + for (dev_idx = 0; dev_idx < per_pin->num_devices; dev_idx++) { >> + struct hdmi_spec_per_device *per_device = >> &per_pin->devices[dev_idx]; >> + eld_device_proc_free(per_device); >> + } >> + } else >> + eld_device_proc_free(&per_pin->devices[0]); >> } >> >> hdmi_array_free(spec); >> @@ -2333,6 +2400,7 @@ static int patch_generic_hdmi(struct hda_codec >> *codec) >> if (is_haswell_plus(codec)) { >> intel_haswell_enable_all_pins(codec, true); >> intel_haswell_fixup_enable_dp12(codec); >> + codec->dp_mst = true; >> } >> >> if (is_haswell_plus(codec) || is_valleyview_plus(codec)) @@ -2346,7 >> +2414,6 @@ static int patch_generic_hdmi(struct hda_codec *codec) >> codec->patch_ops = generic_hdmi_patch_ops; >> if (is_haswell_plus(codec)) { >> codec->patch_ops.set_power_state = haswell_set_power_state; >> - codec->dp_mst = true; >> } >> >> generic_hdmi_init_per_pins(codec); >> -- >> 2.4.1 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx(a)lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

9 22

[alsa-devel] [PATCH] ASoC: dapm: Don't check dummy dai in soc_dapm_dai_stream_event
by Shengjiu Wang 03 Jul '15

03 Jul '15

Dummy dai can be used by multiple sound card. But it only belong to one card's dapm list. If another card use it, there will be dapm_assert_locked warning. [ 20.015782] WARNING: CPU: 1 PID: 661 at sound/soc/soc-dapm.c:124 dapm_assert_locked.isra.36+0x4c/0x58() [ 20.025249] Modules linked in: [ 20.028349] CPU: 1 PID: 661 Comm: aplay Not tainted 4.1.0-rc6-next-20150605-00004-gaee05d8-dirty #92 [ 20.037528] Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) [ 20.044110] Backtrace: [ 20.046614] [<80012e00>] (dump_backtrace) from [<80012fa0>] (show_stack+0x18/0x1c) [ 20.054229] r6:809e8060 r5:00000000 r4:00000000 r3:00000000 [ 20.060002] [<80012f88>] (show_stack) from [<807a0f74>] (dump_stack+0x80/0x9c) [ 20.067293] [<807a0ef4>] (dump_stack) from [<8002b144>] (warn_slowpath_common+0x7c/0xb4) [ 20.075427] r5:0000007c r4:00000000 [ 20.079065] [<8002b0c8>] (warn_slowpath_common) from [<8002b1a0>] (warn_slowpath_null+0x24/0x2c) [ 20.087898] r8:00000001 r7:88007c28 r6:ed94a680 r5:809e83e4 r4:ed83d6c0 [ 20.094747] [<8002b17c>] (warn_slowpath_null) from [<8058403c>] (dapm_assert_locked.isra.36+0x4c/0x58) [ 20.104101] [<80583ff0>] (dapm_assert_locked.isra.36) from [<805842ec>] (dapm_mark_dirty+0x64/0xa4) [ 20.113165] [<80584288>] (dapm_mark_dirty) from [<805853a8>] (soc_dapm_dai_stream_event.isra.42+0x30/0xc8) [ 20.122863] r8:ed9b5dbc r7:00000000 r6:00000001 r5:00000001 r4:ed83d6c0 [ 20.129706] [<80585378>] (soc_dapm_dai_stream_event.isra.42) from [<80587e28>] (snd_soc_dapm_stream_event+0x78/0xa0) [ 20.140264] r5:ee2ee62c r4:00000001 [ 20.143918] [<80587db0>] (snd_soc_dapm_stream_event) from [<8058957c>] (soc_pcm_prepare+0x138/0x21c) [ 20.153058] r8:ed8d9480 r7:00000000 r6:ed9b0e00 r5:00000001 r4:ee2ee62c r3:00000000 ... Signed-off-by: Shengjiu Wang <shengjiu.wang(a)freescale.com> --- sound/soc/soc-dapm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index aa327c9..b618541 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3856,6 +3856,9 @@ static void soc_dapm_dai_stream_event(struct snd_soc_dai *dai, int stream, { struct snd_soc_dapm_widget *w; + if (snd_soc_dai_is_dummy(dai)) + return; + if (stream == SNDRV_PCM_STREAM_PLAYBACK) w = dai->playback_widget; else -- 1.7.9.5

2 8

[alsa-devel] [PATCH] ALSA: usb-audio: Add MIDI support for Steinberg MI2/MI4
by Dominic Sacré 03 Jul '15

03 Jul '15

The Steinberg MI2 and MI4 interfaces are compatible with the USB class audio spec, but the MIDI part of the devices is reported as a vendor specific interface. This patch adds entries to quirks-table.h to recognize the MIDI endpoints. Audio functionality was already working and is unaffected by this change. Signed-off-by: Dominic Sacré <dominic.sacre(a)gmx.de> Signed-off-by: Albert Huitsing <albert(a)huitsing.nl> --- sound/usb/quirks-table.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 2f6d3e9..304c02a 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3152,6 +3152,49 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), }, { + /* Steinberg MI2 */ + USB_DEVICE_VENDOR_SPEC(0x0a4e, 0x2040), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = & (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 3, + .type = QUIRK_MIDI_FIXED_ENDPOINT, + .data = &(const struct snd_usb_midi_endpoint_info) { + .out_cables = 0x0001, + .in_cables = 0x0001 + } + }, + { + .ifnum = -1 + } + } + } +}, +{ + /* Steinberg MI4 */ + USB_DEVICE_VENDOR_SPEC(0x0a4e, 0x4040), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = & (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 3, + .type = QUIRK_MIDI_FIXED_ENDPOINT, + .data = &(const struct snd_usb_midi_endpoint_info) { + .out_cables = 0x0001, + .in_cables = 0x0001 + } + }, + { + .ifnum = -1 + } + } + } +}, + +{ /* * Some USB MIDI devices don't have an audio control interface, * so we have to grab MIDI streaming interfaces here. -- 2.4.4

4 7