March 2013 - Alsa-devel - mailman.alsa-project.org

Re: [alsa-devel] [PATCH] Sound: sgtl5000 Allow codec clock frequency to be set.
by Timur Tabi 21 Mar '13

21 Mar '13

On 03/21/2013 12:46 PM, Martin Fuzzey wrote: > On 21/03/13 17:11, Timur Tabi wrote: >> On Thu, Mar 21, 2013 at 3:39 AM, Martin Fuzzey <mfuzzey(a)parkeon.com> wrote: >> >>> With this patch and that DT example the frequency of clock 162 will be _set_ >>> to 20MHz >> Does that mean that it ignores the ' clocks' parameter? > No, in this case the clocks parameter must contain the phandle of a clock > whose rate is configurable. > >> If clock-frequency is omitted the binding is still correct (hence the >> optional) but the frequency of clock 162 would not be modified. >> >> In the documentation I wrote "If both a clock and clock-frequency are >> provided the clock's rate will be set. " maybe this is not clear enough? >> It's not clear what it will be set *to*. > It will be set to the frequency specified by the clock-frquency attribute. > > Would > "If both a clock and clock-frequency are provided clock must support > the set_rate operation and its frequency will be set to the value specified > by clock-frequency" be better? Yes, that's much better. > > > The possible configurations and their use cases are: > > 1) only 'clocks' specified > clock points to a clock specified in the DT which already has an > appropriate frequency and is > configured by some other means external to the sgtl5000 driver > (bootloader, board setup code, or just a fixed rate clock) > > 2) only 'clock-frequency' specified > The chip is assumed to be clocked by a signal having the given > frequency, which may even be generated by a clock unknown to linux. > This could actually be represented as a special case of 1) by defining a > fixed-rate clock in the DT. > > 3) Both 'clocks' and 'clock-frequency' specified > The chip is assumed to be clocked by a rate programmable clock defined > in the clock tree. > clk_set_rate() will be called for this clock to set its rate to that > specified by clock-frequency This should all be in the binding document. > Cases 1 and 2 exist in the current code, this patch adds support for case 3. > > Prior to commit 81e8e4926167ab32593bbb915b45a42024ca1020 "ASoC: fsl: add > sgtl5000 clock support for imx-sgtl5000" > only case 2 was supported > This explains why 2 is not implemented as a special case of 1) > plain 'clock-frequency' was supported before the driver learnt how to > get a clock from the DT And this should be in the patch description. -- Timur Tabi

1 0

Re: [alsa-devel] [PATCH 50/54 v2] ASoC: switch over to use snd_soc_register_component() on tegra20 ac97
by Stephen Warren 21 Mar '13

21 Mar '13

On 03/21/2013 11:19 AM, Lucas Stach wrote: > Am Donnerstag, den 21.03.2013, 11:03 -0600 schrieb Stephen Warren: >> On 03/21/2013 04:37 AM, Kuninori Morimoto wrote: >> >> Lucas, can you please test this to make sure that the change from >> snd_soc_register_dais() to snd_soc_register_dai() (the latter inside >> snd_soc_register_component()) coupled with the change to the >> tegra_wm9712.c machine driver yields the correct results. Thanks. > > Can someone please FWD me the whole patch? I'm not subscribed to > ALSA-devel and wasn't on CC for this patch. I'll do that off-list.

1 0

[alsa-devel] [PATCH] ALSA: hda - Introduce "Headset Mic" name
by David Henningsson 21 Mar '13

21 Mar '13

Headset mic jacks, i e TRRS style jacks with Headphone Left, Headphone Right, Mic and GND signals, are becoming increasingly common and are now being shipped by several manufacturers. Unfortunately, the HDA specification does not give us any hint of whether a Mic pin belongs to such a jack or not, but it would still be helpful for the user to know (especially if there is one TRS Mic jack and one TRRS headset jack). This new fixup causes the first (non-dock, non-internal) mic to be a headset mic jack. The algorithm can be later refined if needed. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/hda_auto_parser.c | 24 ++++++++++++++++++++++-- sound/pci/hda/hda_auto_parser.h | 2 ++ sound/pci/hda/patch_sigmatel.c | 6 +++++- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c index a3ea76a..6b173b3 100644 --- a/sound/pci/hda/hda_auto_parser.c +++ b/sound/pci/hda/hda_auto_parser.c @@ -260,6 +260,22 @@ int snd_hda_parse_pin_defcfg(struct hda_codec *codec, } } + /* Take first mic to be a headset mic pin */ + if (cond_flags & HDA_PINCFG_HEADSET_MIC) { + for (i = 0; i < cfg->num_inputs; i++) { + int attr; + unsigned int def_conf; + if (cfg->inputs[i].type != AUTO_PIN_MIC) + continue; + def_conf = snd_hda_codec_get_pincfg(codec, cfg->inputs[i].pin); + attr = snd_hda_get_input_pin_attr(def_conf); + if (attr <= INPUT_PIN_ATTR_DOCK) + continue; + cfg->inputs[i].is_headset_mic = 1; + break; + } + } + /* FIX-UP: * If no line-out is defined but multiple HPs are found, * some of them might be the real line-outs. @@ -388,6 +404,7 @@ EXPORT_SYMBOL_HDA(snd_hda_get_input_pin_attr); */ static const char *hda_get_input_pin_label(struct hda_codec *codec, + const struct auto_pin_cfg_item *item, hda_nid_t pin, bool check_location) { unsigned int def_conf; @@ -400,6 +417,8 @@ static const char *hda_get_input_pin_label(struct hda_codec *codec, switch (get_defcfg_device(def_conf)) { case AC_JACK_MIC_IN: + if (item && item->is_headset_mic) + return "Headset Mic"; if (!check_location) return "Mic"; attr = snd_hda_get_input_pin_attr(def_conf); @@ -480,7 +499,8 @@ const char *hda_get_autocfg_input_label(struct hda_codec *codec, has_multiple_pins = 1; if (has_multiple_pins && type == AUTO_PIN_MIC) has_multiple_pins &= check_mic_location_need(codec, cfg, input); - return hda_get_input_pin_label(codec, cfg->inputs[input].pin, + return hda_get_input_pin_label(codec, &cfg->inputs[input], + cfg->inputs[input].pin, has_multiple_pins); } EXPORT_SYMBOL_HDA(hda_get_autocfg_input_label); @@ -649,7 +669,7 @@ int snd_hda_get_pin_label(struct hda_codec *codec, hda_nid_t nid, } } if (!name) - name = hda_get_input_pin_label(codec, nid, true); + name = hda_get_input_pin_label(codec, NULL, nid, true); break; } if (!name) diff --git a/sound/pci/hda/hda_auto_parser.h b/sound/pci/hda/hda_auto_parser.h index f748071..98a72d0 100644 --- a/sound/pci/hda/hda_auto_parser.h +++ b/sound/pci/hda/hda_auto_parser.h @@ -36,6 +36,7 @@ enum { struct auto_pin_cfg_item { hda_nid_t pin; int type; + int is_headset_mic:1; }; struct auto_pin_cfg; @@ -80,6 +81,7 @@ struct auto_pin_cfg { /* bit-flags for snd_hda_parse_pin_def_config() behavior */ #define HDA_PINCFG_NO_HP_FIXUP (1 << 0) /* no HP-split */ #define HDA_PINCFG_NO_LO_FIXUP (1 << 1) /* don't take other outs as LO */ +#define HDA_PINCFG_HEADSET_MIC (1 << 2) /* Take first mic as headset mic */ int snd_hda_parse_pin_defcfg(struct hda_codec *codec, struct auto_pin_cfg *cfg, diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 3be877b..1d9d642 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -3528,8 +3528,12 @@ static int stac_parse_auto_config(struct hda_codec *codec) { struct sigmatel_spec *spec = codec->spec; int err; + int flags = 0; - err = snd_hda_parse_pin_defcfg(codec, &spec->gen.autocfg, NULL, 0); + if (spec->headset_jack) + flags |= HDA_PINCFG_HEADSET_MIC; + + err = snd_hda_parse_pin_defcfg(codec, &spec->gen.autocfg, NULL, flags); if (err < 0) return err; -- 1.7.9.5

2 7

Re: [alsa-devel] [PATCH] Sound: sgtl5000 Allow codec clock frequency to be set.
by Timur Tabi 21 Mar '13

21 Mar '13

On Thu, Mar 21, 2013 at 3:39 AM, Martin Fuzzey <mfuzzey(a)parkeon.com> wrote: > With this patch and that DT example the frequency of clock 162 will be _set_ > to 20MHz Does that mean that it ignores the ' clocks' parameter? > If clock-frequency is omitted the binding is still correct (hence the > optional) but the frequency of clock 162 would not be modified. > > In the documentation I wrote "If both a clock and clock-frequency are > provided the clock's rate will be set. " maybe this is not clear enough? It's not clear what it will be set *to*.

1 0

[alsa-devel] [PATCH v2 1/2] ALSA: hda - Introduce "Headset Mic" name
by David Henningsson 21 Mar '13

21 Mar '13

Headset mic jacks, i e TRRS style jacks with Headphone Left, Headphone Right, Mic and GND signals, are becoming increasingly common and are now being shipped by several manufacturers. Unfortunately, the HDA specification does not give us any hint of whether a Mic pin belongs to such a jack or not, but it would still be helpful for the user to know (especially if there is one TRS Mic jack and one TRRS headset jack). This new fixup causes the first (non-dock, non-internal) mic to be a headset mic jack. The algorithm can be later refined if needed. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/hda_auto_parser.c | 24 ++++++++++++++++++++++-- sound/pci/hda/hda_auto_parser.h | 2 ++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c index a3ea76a..6b173b3 100644 --- a/sound/pci/hda/hda_auto_parser.c +++ b/sound/pci/hda/hda_auto_parser.c @@ -260,6 +260,22 @@ int snd_hda_parse_pin_defcfg(struct hda_codec *codec, } } + /* Take first mic to be a headset mic pin */ + if (cond_flags & HDA_PINCFG_HEADSET_MIC) { + for (i = 0; i < cfg->num_inputs; i++) { + int attr; + unsigned int def_conf; + if (cfg->inputs[i].type != AUTO_PIN_MIC) + continue; + def_conf = snd_hda_codec_get_pincfg(codec, cfg->inputs[i].pin); + attr = snd_hda_get_input_pin_attr(def_conf); + if (attr <= INPUT_PIN_ATTR_DOCK) + continue; + cfg->inputs[i].is_headset_mic = 1; + break; + } + } + /* FIX-UP: * If no line-out is defined but multiple HPs are found, * some of them might be the real line-outs. @@ -388,6 +404,7 @@ EXPORT_SYMBOL_HDA(snd_hda_get_input_pin_attr); */ static const char *hda_get_input_pin_label(struct hda_codec *codec, + const struct auto_pin_cfg_item *item, hda_nid_t pin, bool check_location) { unsigned int def_conf; @@ -400,6 +417,8 @@ static const char *hda_get_input_pin_label(struct hda_codec *codec, switch (get_defcfg_device(def_conf)) { case AC_JACK_MIC_IN: + if (item && item->is_headset_mic) + return "Headset Mic"; if (!check_location) return "Mic"; attr = snd_hda_get_input_pin_attr(def_conf); @@ -480,7 +499,8 @@ const char *hda_get_autocfg_input_label(struct hda_codec *codec, has_multiple_pins = 1; if (has_multiple_pins && type == AUTO_PIN_MIC) has_multiple_pins &= check_mic_location_need(codec, cfg, input); - return hda_get_input_pin_label(codec, cfg->inputs[input].pin, + return hda_get_input_pin_label(codec, &cfg->inputs[input], + cfg->inputs[input].pin, has_multiple_pins); } EXPORT_SYMBOL_HDA(hda_get_autocfg_input_label); @@ -649,7 +669,7 @@ int snd_hda_get_pin_label(struct hda_codec *codec, hda_nid_t nid, } } if (!name) - name = hda_get_input_pin_label(codec, nid, true); + name = hda_get_input_pin_label(codec, NULL, nid, true); break; } if (!name) diff --git a/sound/pci/hda/hda_auto_parser.h b/sound/pci/hda/hda_auto_parser.h index f748071..c7826ce 100644 --- a/sound/pci/hda/hda_auto_parser.h +++ b/sound/pci/hda/hda_auto_parser.h @@ -36,6 +36,7 @@ enum { struct auto_pin_cfg_item { hda_nid_t pin; int type; + unsigned int is_headset_mic:1; }; struct auto_pin_cfg; @@ -80,6 +81,7 @@ struct auto_pin_cfg { /* bit-flags for snd_hda_parse_pin_def_config() behavior */ #define HDA_PINCFG_NO_HP_FIXUP (1 << 0) /* no HP-split */ #define HDA_PINCFG_NO_LO_FIXUP (1 << 1) /* don't take other outs as LO */ +#define HDA_PINCFG_HEADSET_MIC (1 << 2) /* Take first mic as headset mic */ int snd_hda_parse_pin_defcfg(struct hda_codec *codec, struct auto_pin_cfg *cfg, -- 1.7.9.5

1 1

Re: [alsa-devel] [PATCH] Sound: sgtl5000 Allow codec clock frequency to be set.
by Timur Tabi 21 Mar '13

21 Mar '13

Martin Fuzzey wrote: > +If a clock is provided, clock-frequency is optional > + > +If no clock is provided clock-frequency is required (this represents the codec > +being clocked by an external signal not present in the clock tree) > + > +If both a clock and clock-frequency are provided the clock's rate will be set. > + > + > Example: > > codec: sgtl5000@0a { > compatible = "fsl,sgtl5000"; > reg = <0x0a>; > + clock-frequency = <20000000>; > + clocks = <&clks 162>; /* cko1 */ The code looks okay, but I'm not sure this example is right. The binding says that clock-frequency is optional if 'clocks' is provided, but here you list both. You should probably have two examples. -- Timur Tabi

1 0

Re: [alsa-devel] [PATCH 1/2] ASoC: wm8903: Add the DAC boost control
by Mark Brown 20 Mar '13

20 Mar '13

On Wed, Mar 20, 2013 at 05:37:32PM +0100, Alban Bedel wrote: > Signed-off-by: Alban Bedel <alban.bedel(a)avionic-design.de> Applied, thanks.

1 0

[alsa-devel] [PATCH] salsa-lib: Rename _sndrv_pcm_format to _snd_pcm_format
by Mihail Zenkov 20 Mar '13

20 Mar '13

Rename _sndrv_pcm_format to _snd_pcm_format for compatible with alsa-lib. --- salsa-lib-a55ce0c348cd16e7853dae11e8e0e1b5a101d884/src/asound.h +++ salsa-lib-a55ce0c348cd16e7853dae11e8e0e1b5a101d884-1/src/asound.h @@ -133,7 +133,7 @@ SND_PCM_ACCESS_LAST = SND_PCM_ACCESS_RW_NONINTERLEAVED, } snd_pcm_access_t; -typedef enum _sndrv_pcm_format { +typedef enum _snd_pcm_format { SND_PCM_FORMAT_UNKNOWN = -1, SND_PCM_FORMAT_S8 = 0, /* signed */ SND_PCM_FORMAT_U8, /* unsigned */

2 1

[alsa-devel] [PATCH] salsa-lib: Set SNDRV_PCM_HW_PARAMS_NORESAMPLE by default
by Mihail Zenkov 20 Mar '13

20 Mar '13

As we don't allow resampling set SNDRV_PCM_HW_PARAMS_NORESAMPLE by default to respect snd_pcm_hw_rule_noresample in drivers. --- salsa-lib-a55ce0c348cd16e7853dae11e8e0e1b5a101d884/src/pcm_params.c +++ salsa-lib-a55ce0c348cd16e7853dae11e8e0e1b5a101d884-1/src/pcm_params.c @@ -436,6 +436,7 @@ params->rmask = ~0U; params->cmask = 0; params->info = ~0U; + params->flags = SNDRV_PCM_HW_PARAMS_NORESAMPLE; } int snd_pcm_hw_params_any(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)

2 1

[alsa-devel] [PATCH] salsa-lib: Fix mistakes after refactoring pcm_params.c
by Mihail Zenkov 20 Mar '13

20 Mar '13

Fix some regressions after refactoring pcm_params.c These mistakes don't allow snd_pcm_hw_param_set_near to establish correct value. --- salsa-lib-a55ce0c348cd16e7853dae11e8e0e1b5a101d884/src/pcm_params.c +++ salsa-lib-a55ce0c348cd16e7853dae11e8e0e1b5a101d884-1/src/pcm_params.c @@ -590,11 +590,9 @@ save = *params; err = hw_param_set_max(params, var, *val, dir ? *dir : 0); - if (!err) { - err = hw_param_update_var(pcm, params, var, err); - if (!err) - return _snd_pcm_hw_param_get_max(params, var, val, dir); - } + err = hw_param_update_var(pcm, params, var, err); + if (!err) + return _snd_pcm_hw_param_get_max(params, var, val, dir); *params = save; return err; } @@ -683,7 +681,7 @@ snd_pcm_hw_params_t save = *params; int err = hw_param_set(params, var, val, dir); err = hw_param_update_var(pcm, params, var, err); - if (err) + if (err < 0) *params = save; return err; } @@ -712,7 +710,7 @@ save = *params; i->integer = 1; err = hw_param_update_var(pcm, params, var, 1); - if (err) + if (err < 0) *params = save; return err; } @@ -827,7 +825,7 @@ else if (valdir == 0) maxdir = -1; else { - valdir = 1; + maxdir = 1; max--; } save = *params;

2 1