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

Re: [alsa-devel] [PATCH for 3.4] MFD: twl6040: Convert to i2c driver, and separate it from twl core
by Peter Ujfalusi 16 Apr '12

16 Apr '12

Hi Samuel, On 04/16/2012 05:46 PM, Samuel Ortiz wrote: > Applied to my for-linus branch. I'll send a pull request this week, so I > expect it to make it to rc4. Thank you! -- Péter

1 0

[alsa-devel] [PATCH] ASoC: da7210: Add support for PLL and SRM
by Ashish Chavan 16 Apr '12

16 Apr '12

Current DA7210 driver does support PLL mode fully. It uses fixed value of input master clock and PLL mode is enabled and disabled based on the sampling frequency being used for playback or recording. It also doesn't support Sample Rate Measurement feature of DA7210 hardware. This patch adds full support for PLL and SRM. Basically following three modes of operation are possible for DA7210 hardware, (1) I2S SLAVE mode with PLL bypassed (2) I2S SLAVE mode with PLL enabled (3) I2S Master mode with PLL enabled This patch adds support for all three modes. Also, in case of SLAVE mode with PLL, it supports SRM (Sample Rate Measurement) feature of the chip. Actually this patch was submitted earlier and received some review comments, but after that the driver got update by other patches. Because of that, I am considering this as new patch and not versioning it based of previous patches. This version tries to take care of all review comments received for earlier submissions. Signed-off-by: Ashish Chavan <ashish.chavan(a)kpitcummins.com> Signed-off-by: David Dajun Chen <dchen(a)diasemi.com> --- sound/soc/codecs/da7210.c | 237 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 199 insertions(+), 38 deletions(-) diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index 5dfdf6e..3864ccc 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c @@ -148,6 +148,7 @@ #define DA7210_DAI_EN (1 << 7) /*PLL_DIV3 bit fields */ +#define DA7210_PLL_DIV_L_MASK (0xF << 0) #define DA7210_MCLK_RANGE_10_20_MHZ (1 << 4) #define DA7210_PLL_BYP (1 << 6) @@ -164,12 +165,16 @@ #define DA7210_PLL_FS_48000 (0xB << 0) #define DA7210_PLL_FS_88200 (0xE << 0) #define DA7210_PLL_FS_96000 (0xF << 0) +#define DA7210_MCLK_DET_EN (0x1 << 5) +#define DA7210_MCLK_SRM_EN (0x1 << 6) #define DA7210_PLL_EN (0x1 << 7) /* SOFTMUTE bit fields */ #define DA7210_RAMP_EN (1 << 6) /* CONTROL bit fields */ +#define DA7210_REG_EN (1 << 0) +#define DA7210_BIAS_EN (1 << 2) #define DA7210_NOISE_SUP_EN (1 << 3) /* IN_GAIN bit fields */ @@ -208,6 +213,53 @@ #define DA7210_OUT2_OUTMIX_L (1 << 6) #define DA7210_OUT2_EN (1 << 7) +/* Number of PLL input frequencies supported */ +#define FREF_CNT (7 << 0) + +/* Index of first relevant row in PLL divider table */ +#define MASTER_2822400_DIV_OFFSET 0 +#define MASTER_3072000_DIV_OFFSET (MASTER_2822400_DIV_OFFSET + FREF_CNT) +#define SLAVE_SRM_DIV_OFFSET (MASTER_3072000_DIV_OFFSET + FREF_CNT) + +struct pll_div { + int fref; + u8 div1; + u8 div2; + u8 div3; +}; + +/* PLL dividers table */ +static const struct pll_div da7210_pll_div[] = { + /* for MASTER mode, fs = 44.1Khz */ + { 12000000, 0xE8, 0x6C, 0x2, }, /* MCLK=12Mhz */ + { 13000000, 0xDF, 0x28, 0xC, }, /* MCLK=13Mhz */ + { 13500000, 0xDB, 0x0A, 0xD, }, /* MCLK=13.5Mhz */ + { 14400000, 0xD4, 0x5A, 0x2, }, /* MCLK=14.4Mhz */ + { 19200000, 0xBB, 0x43, 0x9, }, /* MCLK=19.2Mhz */ + { 19680000, 0xB9, 0x6D, 0xA, }, /* MCLK=19.68Mhz */ + { 19800000, 0xB8, 0xFB, 0xB, }, /* MCLK=19.8Mhz */ + /* for MASTER mode, fs = 48Khz */ + { 12000000, 0xF3, 0x12, 0x7, }, /* MCLK=12Mhz */ + { 13000000, 0xE8, 0xFD, 0x5, }, /* MCLK=13Mhz */ + { 13500000, 0xE4, 0x82, 0x3, }, /* MCLK=13.5Mhz */ + { 14400000, 0xDD, 0x3A, 0x0, }, /* MCLK=14.4Mhz */ + { 19200000, 0xC1, 0xEB, 0x8, }, /* MCLK=19.2Mhz */ + { 19680000, 0xBF, 0xEC, 0x0, }, /* MCLK=19.68Mhz */ + { 19800000, 0xBF, 0x70, 0x0, }, /* MCLK=19.8Mhz */ + /* for SLAVE mode with SRM */ + { 12000000, 0xED, 0xBF, 0x5, }, /* MCLK=12Mhz */ + { 13000000, 0xE4, 0x13, 0x0, }, /* MCLK=13Mhz */ + { 13500000, 0xDF, 0xC6, 0x8, }, /* MCLK=13.5Mhz */ + { 14400000, 0xD8, 0xCA, 0x1, }, /* MCLK=14.4Mhz */ + { 19200000, 0xBE, 0x97, 0x9, }, /* MCLK=19.2Mhz */ + { 19680000, 0xBC, 0xAC, 0xD, }, /* MCLK=19.68Mhz */ + { 19800000, 0xBC, 0x35, 0xE, }, /* MCLK=19.8Mhz */ +}; + +enum clk_src { + DA7210_CLKSRC_MCLK +}; + #define DA7210_VERSION "0.0.1" /* @@ -630,6 +682,8 @@ static const struct snd_soc_dapm_route da7210_audio_map[] = { /* Codec private data */ struct da7210_priv { struct regmap *regmap; + unsigned int mclk_rate; + int master; }; static struct reg_default da7210_reg_defaults[] = { @@ -717,8 +771,9 @@ static int da7210_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct snd_soc_codec *codec = dai->codec; + struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec); u32 dai_cfg1; - u32 fs, bypass; + u32 fs, sysclk; /* set DAI source to Left and Right ADC */ snd_soc_write(codec, DA7210_DAI_SRC_SEL, @@ -751,43 +806,43 @@ static int da7210_hw_params(struct snd_pcm_substream *substream, switch (params_rate(params)) { case 8000: fs = DA7210_PLL_FS_8000; - bypass = DA7210_PLL_BYP; + sysclk = 3072000; break; case 11025: fs = DA7210_PLL_FS_11025; - bypass = 0; + sysclk = 2822400; break; case 12000: fs = DA7210_PLL_FS_12000; - bypass = DA7210_PLL_BYP; + sysclk = 3072000; break; case 16000: fs = DA7210_PLL_FS_16000; - bypass = DA7210_PLL_BYP; + sysclk = 3072000; break; case 22050: fs = DA7210_PLL_FS_22050; - bypass = 0; + sysclk = 2822400; break; case 32000: fs = DA7210_PLL_FS_32000; - bypass = DA7210_PLL_BYP; + sysclk = 3072000; break; case 44100: fs = DA7210_PLL_FS_44100; - bypass = 0; + sysclk = 2822400; break; case 48000: fs = DA7210_PLL_FS_48000; - bypass = DA7210_PLL_BYP; + sysclk = 3072000; break; case 88200: fs = DA7210_PLL_FS_88200; - bypass = 0; + sysclk = 2822400; break; case 96000: fs = DA7210_PLL_FS_96000; - bypass = DA7210_PLL_BYP; + sysclk = 3072000; break; default: return -EINVAL; @@ -797,8 +852,15 @@ static int da7210_hw_params(struct snd_pcm_substream *substream, snd_soc_update_bits(codec, DA7210_STARTUP1, DA7210_SC_MST_EN, 0); snd_soc_update_bits(codec, DA7210_PLL, DA7210_PLL_FS_MASK, fs); - snd_soc_update_bits(codec, DA7210_PLL_DIV3, DA7210_PLL_BYP, bypass); + if (da7210->mclk_rate && (da7210->mclk_rate != sysclk)) { + /* PLL mode, disable PLL bypass */ + snd_soc_update_bits(codec, DA7210_PLL_DIV3, DA7210_PLL_BYP, 0); + } else { + /* PLL bypass mode, enable PLL bypass */ + snd_soc_update_bits(codec, DA7210_PLL_DIV3, DA7210_PLL_BYP, + DA7210_PLL_BYP); + } /* Enable active mode */ snd_soc_update_bits(codec, DA7210_STARTUP1, DA7210_SC_MST_EN, DA7210_SC_MST_EN); @@ -812,17 +874,24 @@ static int da7210_hw_params(struct snd_pcm_substream *substream, static int da7210_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt) { struct snd_soc_codec *codec = codec_dai->codec; + struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec); u32 dai_cfg1; u32 dai_cfg3; dai_cfg1 = 0x7f & snd_soc_read(codec, DA7210_DAI_CFG1); dai_cfg3 = 0xfc & snd_soc_read(codec, DA7210_DAI_CFG3); + if ((snd_soc_read(codec, DA7210_PLL) & DA7210_PLL_EN) && + (!(snd_soc_read(codec, DA7210_PLL_DIV3) & DA7210_PLL_BYP))) + return -EINVAL; + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBM_CFM: + da7210->master = 1; dai_cfg1 |= DA7210_DAI_MODE_MASTER; break; case SND_SOC_DAIFMT_CBS_CFS: + da7210->master = 0; dai_cfg1 |= DA7210_DAI_MODE_SLAVE; break; default: @@ -874,10 +943,120 @@ static int da7210_mute(struct snd_soc_dai *dai, int mute) #define DA7210_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) +static int da7210_set_dai_sysclk(struct snd_soc_dai *codec_dai, + int clk_id, unsigned int freq, int dir) +{ + struct snd_soc_codec *codec = codec_dai->codec; + struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec); + + switch (clk_id) { + case DA7210_CLKSRC_MCLK: + switch (freq) { + case 12000000: + case 13000000: + case 13500000: + case 14400000: + case 19200000: + case 19680000: + case 19800000: + da7210->mclk_rate = freq; + return 0; + default: + dev_err(codec_dai->dev, "Unsupported MCLK value %d\n", + freq); + return -EINVAL; + } + break; + default: + dev_err(codec_dai->dev, "Unknown clock source %d\n", clk_id); + return -EINVAL; + } +} + +/** + * da7210_set_dai_pll :Configure the codec PLL + * @param codec_dai : pointer to codec DAI + * @param pll_id : da7210 has only one pll, so pll_id is always zero + * @param fref : MCLK frequency, should be < 20MHz + * @param fout : FsDM value, Refer page 44 & 45 of datasheet + * @return int : Zero for success, negative error code for error + * + * Note: Supported PLL input frequencies are 12MHz, 13MHz, 13.5MHz, 14.4MHz, + * 19.2MHz, 19.6MHz and 19.8MHz + */ +static int da7210_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, + int source, unsigned int fref, unsigned int fout) +{ + struct snd_soc_codec *codec = codec_dai->codec; + struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec); + + u8 pll_div1, pll_div2, pll_div3, row_idx, cnt; + + if (da7210->master) { + /* In PLL master mode, use master mode PLL dividers */ + switch (fout) { + case 2822400: + row_idx = MASTER_2822400_DIV_OFFSET; + break; + case 3072000: + row_idx = MASTER_3072000_DIV_OFFSET; + break; + default: + dev_err(codec_dai->dev, + "Unsupported PLL output frequency %d\n", fout); + return -EINVAL; + } + } else { + /* In PLL slave mode, use SRM mode PLL dividers */ + row_idx = SLAVE_SRM_DIV_OFFSET; + } + + for (cnt = 0; cnt < FREF_CNT; cnt++) { + if (fref == da7210_pll_div[row_idx + cnt].fref) { + pll_div1 = da7210_pll_div[row_idx + cnt].div1; + pll_div2 = da7210_pll_div[row_idx + cnt].div2; + pll_div3 = da7210_pll_div[row_idx + cnt].div3; + break; + } + } + if (cnt >= FREF_CNT) + goto err; + + /* Disable active mode */ + snd_soc_update_bits(codec, DA7210_STARTUP1, DA7210_SC_MST_EN, 0); + /* Write PLL dividers */ + snd_soc_write(codec, DA7210_PLL_DIV1, pll_div1); + snd_soc_write(codec, DA7210_PLL_DIV2, pll_div2); + snd_soc_update_bits(codec, DA7210_PLL_DIV3, + DA7210_PLL_DIV_L_MASK, pll_div3); + + if (da7210->master) { + /* In master mode, no need to enable SRM */ + snd_soc_update_bits(codec, DA7210_PLL, DA7210_PLL_EN, + DA7210_PLL_EN); + } else { + /* In slave mode, enable SRM and PLL */ + snd_soc_update_bits(codec, DA7210_PLL, + (DA7210_PLL_EN | DA7210_MCLK_SRM_EN | + DA7210_MCLK_DET_EN), + (DA7210_PLL_EN | DA7210_MCLK_SRM_EN | + DA7210_MCLK_DET_EN)); + } + /* Enable active mode */ + snd_soc_update_bits(codec, DA7210_STARTUP1, DA7210_SC_MST_EN, + DA7210_SC_MST_EN); + return 0; +err: + dev_err(codec_dai->dev, "Unsupported PLL input frequency %d\n", fref); + return -EINVAL; +} + /* DAI operations */ static const struct snd_soc_dai_ops da7210_dai_ops = { .hw_params = da7210_hw_params, .set_fmt = da7210_set_dai_fmt, + .set_sysclk = da7210_set_dai_sysclk, + .set_pll = da7210_set_dai_pll, .digital_mute = da7210_mute, }; @@ -917,17 +1096,11 @@ static int da7210_probe(struct snd_soc_codec *codec) return ret; } - /* FIXME - * - * This driver use fixed value here - * And below settings expects MCLK = 12.288MHz - * - * When you select different MCLK, please check... - * DA7210_PLL_DIV1 val - * DA7210_PLL_DIV2 val - * DA7210_PLL_DIV3 val - * DA7210_PLL_DIV3 :: DA7210_MCLK_RANGExxx - */ + da7210->mclk_rate = 0; /* This will be set from set_sysclk() */ + da7210->master = 0; /* This will be set from set_fmt() */ + + /* Enable internal regulator & bias current */ + snd_soc_write(codec, DA7210_CONTROL, DA7210_REG_EN | DA7210_BIAS_EN); /* * ADC settings @@ -1002,24 +1175,12 @@ static int da7210_probe(struct snd_soc_codec *codec) /* Enable Aux2 */ snd_soc_write(codec, DA7210_AUX2, DA7210_AUX2_EN); + /* Set PLL Master clock range 10-20 MHz */ + snd_soc_write(codec, DA7210_PLL_DIV3, DA7210_MCLK_RANGE_10_20_MHZ); + /* Diable PLL and bypass it */ snd_soc_write(codec, DA7210_PLL, DA7210_PLL_FS_48000); - /* - * If 48kHz sound came, it use bypass mode, - * and when it is 44.1kHz, it use PLL. - * - * This time, this driver sets PLL always ON - * and controls bypass/PLL mode by switching - * DA7210_PLL_DIV3 :: DA7210_PLL_BYP bit. - * see da7210_hw_params - */ - snd_soc_write(codec, DA7210_PLL_DIV1, 0xE5); /* MCLK = 12.288MHz */ - snd_soc_write(codec, DA7210_PLL_DIV2, 0x99); - snd_soc_write(codec, DA7210_PLL_DIV3, 0x0A | - DA7210_MCLK_RANGE_10_20_MHZ | DA7210_PLL_BYP); - snd_soc_update_bits(codec, DA7210_PLL, DA7210_PLL_EN, DA7210_PLL_EN); - /* Activate all enabled subsystem */ snd_soc_write(codec, DA7210_STARTUP1, DA7210_SC_MST_EN); -- 1.7.1

2 5

[alsa-devel] [PATCH v2] control_external: Add ability to specify TLV data.
by Dylan Reid 16 Apr '12

16 Apr '12

Allow external control plugins to provide TLV data. This allows user-space pcms to specify dB ranges for controls. This follows the same model as the ALSA drivers for accessing the data. The code is based on that implementation. The control can provide static data or a callback. The data is accessed or modified in the new snd_ctl_ext_elem_tlv callback. Rev bump the protocol version to enable checking if an external control supports TLV. Signed-off-by: Dylan Reid <dgreid(a)chromium.org> --- include/control_external.h | 17 +++++++++++++++- src/control/control_ext.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletions(-) diff --git a/include/control_external.h b/include/control_external.h index 7c066cf..5392ea6 100644 --- a/include/control_external.h +++ b/include/control_external.h @@ -60,13 +60,16 @@ typedef struct snd_ctl_ext snd_ctl_ext_t; typedef struct snd_ctl_ext_callback snd_ctl_ext_callback_t; /** Key to access a control pointer */ typedef unsigned long snd_ctl_ext_key_t; +/** Callback to handle TLV commands. */ +typedef int (snd_ctl_ext_tlv_rw_t)(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key, int op_flag, unsigned int numid, + unsigned int *tlv, unsigned int tlv_size); /* * Protocol version */ #define SND_CTL_EXT_VERSION_MAJOR 1 /**< Protocol major version */ #define SND_CTL_EXT_VERSION_MINOR 0 /**< Protocol minor version */ -#define SND_CTL_EXT_VERSION_TINY 0 /**< Protocol tiny version */ +#define SND_CTL_EXT_VERSION_TINY 1 /**< Protocol tiny version */ /** * external plugin protocol version */ @@ -122,6 +125,13 @@ struct snd_ctl_ext { * control handle filled by #snd_ctl_ext_create() */ snd_ctl_t *handle; + /** + * optional TLV data for the control. + */ + union { + snd_ctl_ext_tlv_rw_t *c; + const unsigned int *p; + } tlv; int nonblock; /**< non-block mode; read-only */ int subscribed; /**< events subscribed; read-only */ @@ -245,7 +255,12 @@ typedef enum snd_ctl_ext_access { SND_CTL_EXT_ACCESS_WRITE = (1<<1), SND_CTL_EXT_ACCESS_READWRITE = (3<<0), SND_CTL_EXT_ACCESS_VOLATILE = (1<<2), + SND_CTL_EXT_ACCESS_TLV_READ = (1<<4), + SND_CTL_EXT_ACCESS_TLV_WRITE = (1<<5), + SND_CTL_EXT_ACCESS_TLV_READWRITE = (3<<4), + SND_CTL_EXT_ACCESS_TLV_COMMAND = (1<<6), SND_CTL_EXT_ACCESS_INACTIVE = (1<<8), + SND_CTL_EXT_ACCESS_TLV_CALLBACK = (1<<28), } snd_ctl_ext_access_t; /** diff --git a/src/control/control_ext.c b/src/control/control_ext.c index e20d4f3..0a0b397 100644 --- a/src/control/control_ext.c +++ b/src/control/control_ext.c @@ -324,6 +324,51 @@ static int snd_ctl_ext_elem_unlock(snd_ctl_t *handle ATTRIBUTE_UNUSED, return -ENXIO; } +static int snd_ctl_ext_elem_tlv(snd_ctl_t *handle, int op_flag, + unsigned int numid, + unsigned int *tlv, unsigned int tlv_size) +{ + snd_ctl_ext_t *ext = handle->private_data; + snd_ctl_ext_key_t key; + int type, ret; + unsigned int access, count, len; + snd_ctl_elem_id_t id; + + /* we don't support TLV on protocol ver 1.0.0 or earlier */ + if (ext->version <= SNDRV_PROTOCOL_VERSION(1, 0, 0)) + return -ENXIO; + + snd_ctl_elem_id_clear(&id); + if (numid > 0) { + ext->callback->elem_list(ext, numid - 1, &id); + id.numid = numid; + } else + id.numid = 0; + key = ext->callback->find_elem(ext, &id); + + if (key == SND_CTL_EXT_KEY_NOT_FOUND) + return -ENOENT; + ret = ext->callback->get_attribute(ext, key, &type, &access, &count); + if (ret < 0) + return ret; + + if ((op_flag == 0 && (access & SND_CTL_EXT_ACCESS_TLV_READ) == 0) || + (op_flag > 0 && (access & SND_CTL_EXT_ACCESS_TLV_WRITE) == 0) || + (op_flag < 0 && (access & SND_CTL_EXT_ACCESS_TLV_COMMAND) == 0)) + return -ENXIO; + if (access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) { + return ext->tlv.c(ext, key, op_flag, numid, tlv, tlv_size); + } else { + if (op_flag) + return -ENXIO; + len = ext->tlv.p[1] + 2 * sizeof(unsigned int); + if (tlv_size < len) + return -ENOMEM; + memcpy(tlv, ext->tlv.p, len); + return 0; + } +} + static int snd_ctl_ext_next_device(snd_ctl_t *handle ATTRIBUTE_UNUSED, int *device ATTRIBUTE_UNUSED) { @@ -429,6 +474,7 @@ static const snd_ctl_ops_t snd_ctl_ext_ops = { .element_write = snd_ctl_ext_elem_write, .element_lock = snd_ctl_ext_elem_lock, .element_unlock = snd_ctl_ext_elem_unlock, + .element_tlv = snd_ctl_ext_elem_tlv, .hwdep_next_device = snd_ctl_ext_next_device, .hwdep_info = snd_ctl_ext_hwdep_info, .pcm_next_device = snd_ctl_ext_next_device, -- 1.7.9.rc0

2 1

[alsa-devel] [PATCH 1/2] snd-usb-audio: Skip un-parseable mixer units instead of erroring
by Mark Hills 16 Apr '12

16 Apr '12

Some interfaces reference endpoints which do not exists. To accomodate these, do not fail completely, but skip over them. This allows the Electrix Ebox-44 with earlier firmware to be detected and used for audio. Signed-off-by: Mark Hills <mark(a)pogo.org.uk> --- sound/usb/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index ab23869..c374c72 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1388,7 +1388,7 @@ static int parse_audio_mixer_unit(struct mixer_build *state, int unitid, void *r for (pin = 0; pin < input_pins; pin++) { err = parse_audio_unit(state, desc->baSourceID[pin]); if (err < 0) - return err; + continue; err = check_input_term(state, desc->baSourceID[pin], &iterm); if (err < 0) return err; -- 1.7.4.4

3 5

[alsa-devel] [RFC/PATCH] control_external: Add ability to specify TLV data.
by Dylan Reid 16 Apr '12

16 Apr '12

Allow external control plugins to provide TLV data. This allows user-space pcms to specify dB ranges for controls. This follows the same model as the ALSA drivers for accessing the data. The code is based on that implementation. The control can provide static data or a callback. The data is accessed or modified in the new snd_ctl_ext_elem_tlv callback. Rev bump the protocol version to enable checking if an external control supports TLV. Signed-off-by: Dylan Reid <dgreid(a)chromium.org> --- include/control_external.h | 17 +++++++++++++++- src/control/control_ext.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletions(-) diff --git a/include/control_external.h b/include/control_external.h index 7c066cf..5392ea6 100644 --- a/include/control_external.h +++ b/include/control_external.h @@ -60,13 +60,16 @@ typedef struct snd_ctl_ext snd_ctl_ext_t; typedef struct snd_ctl_ext_callback snd_ctl_ext_callback_t; /** Key to access a control pointer */ typedef unsigned long snd_ctl_ext_key_t; +/** Callback to handle TLV commands. */ +typedef int (snd_ctl_ext_tlv_rw_t)(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key, int op_flag, unsigned int numid, + unsigned int *tlv, unsigned int tlv_size); /* * Protocol version */ #define SND_CTL_EXT_VERSION_MAJOR 1 /**< Protocol major version */ #define SND_CTL_EXT_VERSION_MINOR 0 /**< Protocol minor version */ -#define SND_CTL_EXT_VERSION_TINY 0 /**< Protocol tiny version */ +#define SND_CTL_EXT_VERSION_TINY 1 /**< Protocol tiny version */ /** * external plugin protocol version */ @@ -122,6 +125,13 @@ struct snd_ctl_ext { * control handle filled by #snd_ctl_ext_create() */ snd_ctl_t *handle; + /** + * optional TLV data for the control. + */ + union { + snd_ctl_ext_tlv_rw_t *c; + const unsigned int *p; + } tlv; int nonblock; /**< non-block mode; read-only */ int subscribed; /**< events subscribed; read-only */ @@ -245,7 +255,12 @@ typedef enum snd_ctl_ext_access { SND_CTL_EXT_ACCESS_WRITE = (1<<1), SND_CTL_EXT_ACCESS_READWRITE = (3<<0), SND_CTL_EXT_ACCESS_VOLATILE = (1<<2), + SND_CTL_EXT_ACCESS_TLV_READ = (1<<4), + SND_CTL_EXT_ACCESS_TLV_WRITE = (1<<5), + SND_CTL_EXT_ACCESS_TLV_READWRITE = (3<<4), + SND_CTL_EXT_ACCESS_TLV_COMMAND = (1<<6), SND_CTL_EXT_ACCESS_INACTIVE = (1<<8), + SND_CTL_EXT_ACCESS_TLV_CALLBACK = (1<<28), } snd_ctl_ext_access_t; /** diff --git a/src/control/control_ext.c b/src/control/control_ext.c index e20d4f3..0a0b397 100644 --- a/src/control/control_ext.c +++ b/src/control/control_ext.c @@ -324,6 +324,51 @@ static int snd_ctl_ext_elem_unlock(snd_ctl_t *handle ATTRIBUTE_UNUSED, return -ENXIO; } +static int snd_ctl_ext_elem_tlv(snd_ctl_t *handle, int op_flag, + unsigned int numid, + unsigned int *tlv, unsigned int tlv_size) +{ + snd_ctl_ext_t *ext = handle->private_data; + snd_ctl_ext_key_t key; + int type, ret; + unsigned int access, count, len; + snd_ctl_elem_id_t id; + + /* we don't support TLV on protocol ver 1.0.0 or earlier */ + if (ext->version < SNDRV_PROTOCOL_VERSION(1, 0, 0)) + return -ENXIO; + + snd_ctl_elem_id_clear(&id); + if (numid > 0) { + ext->callback->elem_list(ext, numid - 1, &id); + id.numid = numid; + } else + id.numid = 0; + key = ext->callback->find_elem(ext, &id); + + if (key == SND_CTL_EXT_KEY_NOT_FOUND) + return -ENOENT; + ret = ext->callback->get_attribute(ext, key, &type, &access, &count); + if (ret < 0) + return ret; + + if ((op_flag == 0 && (access & SND_CTL_EXT_ACCESS_TLV_READ) == 0) || + (op_flag > 0 && (access & SND_CTL_EXT_ACCESS_TLV_WRITE) == 0) || + (op_flag < 0 && (access & SND_CTL_EXT_ACCESS_TLV_COMMAND) == 0)) + return -ENXIO; + if (access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) { + return ext->tlv.c(ext, key, op_flag, numid, tlv, tlv_size); + } else { + if (op_flag) + return -ENXIO; + len = ext->tlv.p[1] + 2 * sizeof(unsigned int); + if (tlv_size < len) + return -ENOMEM; + memcpy(tlv, ext->tlv.p, len); + return 0; + } +} + static int snd_ctl_ext_next_device(snd_ctl_t *handle ATTRIBUTE_UNUSED, int *device ATTRIBUTE_UNUSED) { @@ -429,6 +474,7 @@ static const snd_ctl_ops_t snd_ctl_ext_ops = { .element_write = snd_ctl_ext_elem_write, .element_lock = snd_ctl_ext_elem_lock, .element_unlock = snd_ctl_ext_elem_unlock, + .element_tlv = snd_ctl_ext_elem_tlv, .hwdep_next_device = snd_ctl_ext_next_device, .hwdep_info = snd_ctl_ext_hwdep_info, .pcm_next_device = snd_ctl_ext_next_device, -- 1.7.9.rc0

2 2

[alsa-devel] [patch] ASoC: dapm: release lock on error paths
by Dan Carpenter 15 Apr '12

15 Apr '12

We added locking here but there were a couple error paths where we forgot to drop the lock before returning. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 82e99b6..3191d01 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2133,7 +2133,7 @@ err: int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_route *route, int num) { - int i, ret; + int i, ret = 0; mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_INIT); for (i = 0; i < num; i++) { @@ -2141,13 +2141,13 @@ int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm, if (ret < 0) { dev_err(dapm->dev, "Failed to add route %s->%s\n", route->source, route->sink); - return ret; + break; } route++; } mutex_unlock(&dapm->card->dapm_mutex); - return 0; + return ret; } EXPORT_SYMBOL_GPL(snd_soc_dapm_add_routes); @@ -2851,6 +2851,7 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm, { struct snd_soc_dapm_widget *w; int i; + int ret = 0; mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_INIT); for (i = 0; i < num; i++) { @@ -2859,12 +2860,13 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm, dev_err(dapm->dev, "ASoC: Failed to create DAPM control %s\n", widget->name); - return -ENOMEM; + ret = -ENOMEM; + break; } widget++; } mutex_unlock(&dapm->card->dapm_mutex); - return 0; + return ret; } EXPORT_SYMBOL_GPL(snd_soc_dapm_new_controls);

2 1

[alsa-devel] No sound on Quanta KN1 with kernel 3.4
by Uros Vampl 14 Apr '12

14 Apr '12

Hi, as I wrote on the -users list, I don't have sound anymore in kernel 3.4. I was told to post the output of alsa-info.sh here, so here I am. The requested output is attached. Regards, Uroš

2 1

[alsa-devel] [PATCH] alsa-lib conf: block S/PDIF access for Sennheiser USB headset
by David Henningsson 14 Apr '12

14 Apr '12

The Sennheiser USB headset has no S/PDIF input or output, so make sure we can't open it that way. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- src/conf/cards/USB-Audio.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf index 966172f..b9148e7 100644 --- a/src/conf/cards/USB-Audio.conf +++ b/src/conf/cards/USB-Audio.conf @@ -38,6 +38,7 @@ USB-Audio.pcm.iec958_device { # "NoiseBlaster 3000" 42 # The below don't have digital in/out, so prevent them from being opened. + "Sennheiser USB headset" 999 "Logitech USB Headset" 999 "USB Device 0x46d:0x992" 999 "Blue Snowball" 999 -- 1.7.9.5

2 1

[alsa-devel] [PATCH V2 1/5] ARM: tegra: provide clock aliases for AHUB configlink
by Stephen Warren 13 Apr '12

13 Apr '12

From: Stephen Warren <swarren(a)nvidia.com> The Tegra30 AHUB driver must call tegra_periph_reset_deassert() for all devices on the AHUB's configlink bus. The AHUB driver must be able to call clk_get_sys() to retrieve the clock parameter for this function. Add the necessary clock aliases to allow this. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- arch/arm/mach-tegra/tegra30_clocks.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-tegra/tegra30_clocks.c b/arch/arm/mach-tegra/tegra30_clocks.c index 6d08b53..e33fe4b 100644 --- a/arch/arm/mach-tegra/tegra30_clocks.c +++ b/arch/arm/mach-tegra/tegra30_clocks.c @@ -3015,6 +3015,15 @@ struct clk_duplicate tegra_clk_duplicates[] = { CLK_DUPLICATE("sbc6", "spi_slave_tegra.5", NULL), CLK_DUPLICATE("twd", "smp_twd", NULL), CLK_DUPLICATE("vcp", "nvavp", "vcp"), + CLK_DUPLICATE("i2s0", NULL, "i2s0"), + CLK_DUPLICATE("i2s1", NULL, "i2s1"), + CLK_DUPLICATE("i2s2", NULL, "i2s2"), + CLK_DUPLICATE("i2s3", NULL, "i2s3"), + CLK_DUPLICATE("i2s4", NULL, "i2s4"), + CLK_DUPLICATE("dam0", NULL, "dam0"), + CLK_DUPLICATE("dam1", NULL, "dam1"), + CLK_DUPLICATE("dam2", NULL, "dam2"), + CLK_DUPLICATE("spdif_in", NULL, "spdif_in"), }; struct clk *tegra_ptr_clks[] = { -- 1.7.0.4

2 7

[alsa-devel] [PATCH 1/2] ASoC: wm1250-ev1: Support stereo
by Mark Brown 13 Apr '12

13 Apr '12

Springbank can support stereo, though it is primarily intended for mono use cases. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm1250-ev1.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm1250-ev1.c b/sound/soc/codecs/wm1250-ev1.c index e7a599a..0766b5f 100644 --- a/sound/soc/codecs/wm1250-ev1.c +++ b/sound/soc/codecs/wm1250-ev1.c @@ -84,14 +84,14 @@ static struct snd_soc_dai_driver wm1250_ev1_dai = { .playback = { .stream_name = "Playback", .channels_min = 1, - .channels_max = 1, + .channels_max = 2, .rates = SNDRV_PCM_RATE_8000, .formats = SNDRV_PCM_FMTBIT_S16_LE, }, .capture = { .stream_name = "Capture", .channels_min = 1, - .channels_max = 1, + .channels_max = 2, .rates = SNDRV_PCM_RATE_8000, .formats = SNDRV_PCM_FMTBIT_S16_LE, }, -- 1.7.9.1

1 1