January 2011 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] ASoC updates for 2.6.38
by Mark Brown 19 Jan '11

19 Jan '11

The following changes since commit 18b022eb117e7f70c191267551ff865f278a9258: Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc (2011-01-12 12:26:24 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.38 Alexander Sverdlin (1): ASoC: EP93xx: fixed LRCLK rate and DMA oper. in I2S code Barry Song (2): ASoC: Blackfin TDM: use external frame syncs ASoC: Blackfin: fix DAI/SPORT config dependency issues Dimitris Papastamos (1): ASoC: WM8990: msleep() takes milliseconds not jiffies Matti J. Aaltonen (1): ASoC: WL1273 FM radio: Fix breakage with MFD API changes Mike Frysinger (2): ASoC: Blackfin TDM: fix missed snd_soc_dai_get_drvdata update ASoC: Blackfin AC97: fix build error after multi-component update Seungwhan Youn (1): ASoC: documentation updates Vasily Khoruzhick (2): ASoC: PXA: Fix jack detection on Zipit Z2 ASoC: PXA: Fix codec address on Zipit Z2 Documentation/sound/alsa/soc/codec.txt | 45 +++++++++---------- Documentation/sound/alsa/soc/machine.txt | 38 ++++------------ Documentation/sound/alsa/soc/platform.txt | 12 ++++- sound/soc/blackfin/Kconfig | 11 +++-- sound/soc/blackfin/bf5xx-ac97.c | 4 +- sound/soc/blackfin/bf5xx-tdm.c | 10 ++-- sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/wl1273.c | 29 +++++------- sound/soc/codecs/wl1273.h | 71 ----------------------------- sound/soc/codecs/wm8990.c | 10 ++-- sound/soc/ep93xx/ep93xx-i2s.c | 18 ++++---- sound/soc/pxa/z2.c | 3 +- 12 files changed, 82 insertions(+), 171 deletions(-)

2 2

Re: [alsa-devel] [PATCH 0/3] Tegra: Add internal speaker support
by Mark Brown 19 Jan '11

19 Jan '11

On Tue, Jan 18, 2011 at 04:43:33PM -0800, Colin Cross wrote: > On Tue, Jan 18, 2011 at 4:29 PM, Stephen Warren <swarren(a)nvidia.com> wrote: > > I'll go read up on gpiolib some more to see how those API-level numbers get > > mapped to a specific controller and GPIO number. > They usually come in through platform data from the board file. See > Olof's recent Tegra sdhci patches for an example. Tegra GPIO names > are defined in arch/arm/mach-tegra/gpio-names.h. Yup, and gpiolib also supports automatic assignment of numbers if you specify -1 as the base number though that's a lot less useful within the kernel.

1 0

[PATCH] ALSA: HDA: Add SKU ignore for another Thinkpad Edge 14
by David Henningsson 19 Jan '11

19 Jan '11

BugLink: http://bugs.launchpad.net/bugs/705323 Thinkpad Edge 14 has one more SSID that suffers from disabled auto-mute. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 4f006ee..b974164 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -14951,6 +14951,7 @@ static struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE), + SND_PCI_QUIRK(0x17aa, 0x21e9, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE), SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE), SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW), SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD), -- 1.7.1 --------------070500050103000507060302--

1 0

[alsa-devel] [PATCH 1/3] ASoC: Explicitly say if we're powering up or down
by Mark Brown 19 Jan '11

19 Jan '11

Rather than passing the sequence to use for DAPM widgets around by reference explicitly say if we're powering up or down until the point where we need the sequence itself. This should make no practical difference in itself but supports future refactoring. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-dapm.c | 37 +++++++++++++++++++++++++------------ 1 files changed, 25 insertions(+), 12 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 499730a..57e1c9f 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -726,8 +726,15 @@ static int dapm_supply_check_power(struct snd_soc_dapm_widget *w) static int dapm_seq_compare(struct snd_soc_dapm_widget *a, struct snd_soc_dapm_widget *b, - int sort[]) + bool power_up) { + int *sort; + + if (power_up) + sort = dapm_up_seq; + else + sort = dapm_down_seq; + if (sort[a->id] != sort[b->id]) return sort[a->id] - sort[b->id]; if (a->reg != b->reg) @@ -741,12 +748,12 @@ static int dapm_seq_compare(struct snd_soc_dapm_widget *a, /* Insert a widget in order into a DAPM power sequence. */ static void dapm_seq_insert(struct snd_soc_dapm_widget *new_widget, struct list_head *list, - int sort[]) + bool power_up) { struct snd_soc_dapm_widget *w; list_for_each_entry(w, list, power_list) - if (dapm_seq_compare(new_widget, w, sort) < 0) { + if (dapm_seq_compare(new_widget, w, power_up) < 0) { list_add_tail(&new_widget->power_list, &w->power_list); return; } @@ -857,7 +864,7 @@ static void dapm_seq_run_coalesced(struct snd_soc_dapm_context *dapm, * handled. */ static void dapm_seq_run(struct snd_soc_dapm_context *dapm, - struct list_head *list, int event, int sort[]) + struct list_head *list, int event, bool power_up) { struct snd_soc_dapm_widget *w, *n; LIST_HEAD(pending); @@ -865,6 +872,12 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm, int cur_reg = SND_SOC_NOPM; struct snd_soc_dapm_context *cur_dapm = NULL; int ret; + int *sort; + + if (power_up) + sort = dapm_up_seq; + else + sort = dapm_down_seq; list_for_each_entry_safe(w, n, list, power_list) { ret = 0; @@ -1002,10 +1015,10 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event) list_for_each_entry(w, &card->widgets, list) { switch (w->id) { case snd_soc_dapm_pre: - dapm_seq_insert(w, &down_list, dapm_down_seq); + dapm_seq_insert(w, &down_list, false); break; case snd_soc_dapm_post: - dapm_seq_insert(w, &up_list, dapm_up_seq); + dapm_seq_insert(w, &up_list, true); break; default: @@ -1025,9 +1038,9 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event) trace_snd_soc_dapm_widget_power(w, power); if (power) - dapm_seq_insert(w, &up_list, dapm_up_seq); + dapm_seq_insert(w, &up_list, true); else - dapm_seq_insert(w, &down_list, dapm_down_seq); + dapm_seq_insert(w, &down_list, false); w->power = power; break; @@ -1086,12 +1099,12 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event) } /* Power down widgets first; try to avoid amplifying pops. */ - dapm_seq_run(dapm, &down_list, event, dapm_down_seq); + dapm_seq_run(dapm, &down_list, event, false); dapm_widget_update(dapm); /* Now power up. */ - dapm_seq_run(dapm, &up_list, event, dapm_up_seq); + dapm_seq_run(dapm, &up_list, event, true); list_for_each_entry(d, &dapm->card->dapm_list, list) { /* If we just powered the last thing off drop to standby bias */ @@ -2372,7 +2385,7 @@ static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm) if (w->dapm != dapm) continue; if (w->power) { - dapm_seq_insert(w, &down_list, dapm_down_seq); + dapm_seq_insert(w, &down_list, false); w->power = 0; powerdown = 1; } @@ -2383,7 +2396,7 @@ static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm) */ if (powerdown) { snd_soc_dapm_set_bias_level(NULL, dapm, SND_SOC_BIAS_PREPARE); - dapm_seq_run(dapm, &down_list, 0, dapm_down_seq); + dapm_seq_run(dapm, &down_list, 0, false); snd_soc_dapm_set_bias_level(NULL, dapm, SND_SOC_BIAS_STANDBY); } } -- 1.7.2.3

2 4

[alsa-devel] [PATCH - [hdspm] 0/3] Support for RME RayDAT and AIO
by Adrian Knoth 19 Jan '11

19 Jan '11

Hi! As announced a few days ago, I've integrated the offspring hdspm driver by Florian Faber. The new code now also supports the 36in/36out RME RayDAT cards and RME AIOs. I tried to follow the kernel's coding style as much as possible, however, there are still a few overlong lines left. For example, I didn't want to break "if read_reg(...) & 0x3f" at "& 0x3f", as it worsens readability. If it's required to comply, feel free to add the missing line breaks. Right now, RayDATs and AIOs can only operate on a single period size of 1024 samples, because these cards always use a fixed 16k buffer per channel and only vary interrupt frequency. I'm going to try to fix this after I've learned more about the PCM interface. ;) Any suggestions welcome. Cheers Adrian Knoth (3): Add headers for RayDAT and AIO support. Enable RME RayDAT and AIO Add RayDAT and AIO strings to Kconfig include/hdspm.h | 442 +++++- pci/Kconfig | 6 +- pci/rme9652/hdspm.c | 4135 +++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 3442 insertions(+), 1141 deletions(-) -- 1.7.2.3

2 7

Re: [alsa-devel] [PATCH 0/3] Tegra: Add internal speaker support
by Mark Brown 19 Jan '11

19 Jan '11

On Tue, Jan 18, 2011 at 04:37:36PM -0700, Stephen Warren wrote: > a) Is this the right way to expose GPIO APIs from a codec? The tlv320aic3 > seems to do it this way, but wm8962.c uses the generic GPIO API. I shied > away from the latter, since I wasn't sure how to name the WM8903's GPIOs > in the gpio_* calls. I suppose it'd need a bunch of GPIO driver platform > data to hook it all together and name GPIOs from a mach-tegra/include > header file, but if this is the way to go, I need to read up on that more. What naming is required for the GPIOs? GPIOs are referred to by number in Linux. > b) Is the WM8903 platform_data handling full fleshed out; simply by having > platform_data, WM8903_WSEQ_ENA is set, whereas without any pdata, it > isn't. Should this be conditional, or should I always have specified some > platform data for Tegra, and I'm just getting lucky that it works without > any? Ah, your comment about the sequencer is clearer now. This is not enabling the write sequencer, that'll be done transiently when required if it's not set here. It's enabling a clock which is used by several parts of the chip including the write sequencer all the time so that the mic detection can function in the absence of any other software managing it. This is why it's conditional on microphone detection being configured, other functions can have this clock disabled most of the time.

2 1

Re: [alsa-devel] [PATCH 1/3] ASoC: WM8903: Add wm8903_set_gpio
by Mark Brown 19 Jan '11

19 Jan '11

On Tue, Jan 18, 2011 at 04:37:37PM -0700, Stephen Warren wrote: > From: Stephen Warren <swarren(a)nvidia.com> This should be implemented using gpiolib - see WM8962 for an example of this. That way the control can be plugged into more other subsystems in the kernel (probably including whenever I or someone else gets around to it a widget like the one you open code in a later patch). I know some of the drivers do export the GPIOs using custom APIs but that's something that should be fixed. > Also, fix platform_data handling to have an explicit "don't touch this pin" > option. This should've been a separate patch since it's OK to go in as-is. > Temporarily hack out the mic detection platform_data handling for simplicity There's no patch restoring the functionality... > tesing the GPIO changes. Should the write-sequencer enabling be conditional? Yes. It's not actually enabling the write sequencer itself, it's enabling a low rate clock that's shared between a number of functions in the device including jack detection. Without the clock jack detection will not function.

1 0

[alsa-devel] [PATCH] ASoC: Add dependency on INTEL_SCU_IPC for Intel MID drivers
by Koul, Vinod 18 Jan '11

18 Jan '11

From: Vinod Koul <vinod.koul(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> Signed-off-by: Harsha Priya <priya.harsha(a)intel.com> --- sound/soc/mid-x86/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/soc/mid-x86/Kconfig b/sound/soc/mid-x86/Kconfig index e0123a4..1ad7538 100644 --- a/sound/soc/mid-x86/Kconfig +++ b/sound/soc/mid-x86/Kconfig @@ -1,5 +1,6 @@ config SND_MFLD_MACHINE tristate "SOC Machine Audio driver for Intel Medfield MID platform" + depends on INTEL_SCU_IPC select SND_SOC_SN95031 select SND_SST_PLATFORM help -- 1.7.2.3

2 1

[alsa-devel] [PATCH] ASoC: core: Remove dapm_sync call from soc_post_component_init
by Peter Ujfalusi 18 Jan '11

18 Jan '11

snd_soc_dapm_new_widgets will call dapm_power_widgets at the end, so there is no need to call snd_soc_dapm_sync after snd_soc_dapm_new_widgets. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)nokia.com> --- sound/soc/soc-core.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index bac7291..952f104 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1467,7 +1467,6 @@ static int soc_post_component_init(struct snd_soc_card *card, /* Make sure all DAPM widgets are instantiated */ snd_soc_dapm_new_widgets(&codec->dapm); - snd_soc_dapm_sync(&codec->dapm); /* register the rtd device */ rtd->codec = codec; -- 1.7.4.rc2

4 3

[alsa-devel] [PATCH 1/2] ASoC: PXA: Fix jack detection on Zipit Z2
by Vasily Khoruzhick 18 Jan '11

18 Jan '11

Fix jack detection on Zipit Z2, otherwise it disables headphones output when jack is connected Signed-off-by: Vasily Khoruzhick <anarsoul(a)gmail.com> --- sound/soc/pxa/z2.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index 4cc841b..0da889d 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c @@ -105,6 +105,7 @@ static struct snd_soc_jack_gpio hs_jack_gpios[] = { .name = "hsdet-gpio", .report = SND_JACK_HEADSET, .debounce_time = 200, + .invert = 1, }, }; -- 1.7.4.rc1

4 5