September 2010 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: Remove -dai suffix from i.MX SSI driver
by Mark Brown 01 Oct '10

01 Oct '10

While it is a generic serial port in practice the i.MX SSI is only supported in Linux as an audio port (the i.MX has dedicated SPI controllers and so on). This means we don't need to disambiguate against other uses of the hardware and so can drop the -dai suffix from the driver name which fixes merge issues with the i.MX tree in -next. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- arch/arm/mach-mx3/clock-imx31.c | 4 ++-- arch/arm/mach-mx3/clock-imx35.c | 4 ++-- arch/arm/mach-mx3/devices.c | 4 ++-- arch/arm/plat-mxc/audmux-v2.c | 4 ++-- sound/soc/imx/eukrea-tlv320.c | 2 +- sound/soc/imx/imx-ssi.c | 2 +- sound/soc/imx/phycore-ac97.c | 2 +- sound/soc/imx/wm1133-ev1.c | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-mx3/clock-imx31.c b/arch/arm/mach-mx3/clock-imx31.c index 9b52a67..9a9eb6d 100644 --- a/arch/arm/mach-mx3/clock-imx31.c +++ b/arch/arm/mach-mx3/clock-imx31.c @@ -558,8 +558,8 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxc_w1.0", NULL, owire_clk) _REGISTER_CLOCK("mxc-mmc.0", NULL, sdhc1_clk) _REGISTER_CLOCK("mxc-mmc.1", NULL, sdhc2_clk) - _REGISTER_CLOCK("imx-ssi-dai.0", NULL, ssi1_clk) - _REGISTER_CLOCK("imx-ssi-dai.1", NULL, ssi2_clk) + _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) + _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) _REGISTER_CLOCK(NULL, "firi", firi_clk) _REGISTER_CLOCK(NULL, "ata", ata_clk) _REGISTER_CLOCK(NULL, "rtic", rtic_clk) diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c index f29c3e9..d3af0fd 100644 --- a/arch/arm/mach-mx3/clock-imx35.c +++ b/arch/arm/mach-mx3/clock-imx35.c @@ -464,8 +464,8 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "sdma", sdma_clk) _REGISTER_CLOCK(NULL, "spba", spba_clk) _REGISTER_CLOCK(NULL, "spdif", spdif_clk) - _REGISTER_CLOCK("imx-ssi-dai.0", NULL, ssi1_clk) - _REGISTER_CLOCK("imx-ssi-dai.1", NULL, ssi2_clk) + _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) + _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk) _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk) _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk) diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index 90eccba..a4fd1a2 100644 --- a/arch/arm/mach-mx3/devices.c +++ b/arch/arm/mach-mx3/devices.c @@ -327,14 +327,14 @@ static struct resource imx_ssi_resources1[] = { }; struct platform_device imx_ssi_device0 = { - .name = "imx-ssi-dai", + .name = "imx-ssi", .id = 0, .num_resources = ARRAY_SIZE(imx_ssi_resources0), .resource = imx_ssi_resources0, }; struct platform_device imx_ssi_device1 = { - .name = "imx-ssi-dai", + .name = "imx-ssi", .id = 1, .num_resources = ARRAY_SIZE(imx_ssi_resources1), .resource = imx_ssi_resources1, diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c index 910374d..f9e7cdb 100644 --- a/arch/arm/plat-mxc/audmux-v2.c +++ b/arch/arm/plat-mxc/audmux-v2.c @@ -45,9 +45,9 @@ static const char *audmux_port_string(int port) { switch (port) { case MX31_AUDMUX_PORT1_SSI0: - return "imx-ssi-dai.0"; + return "imx-ssi.0"; case MX31_AUDMUX_PORT2_SSI1: - return "imx-ssi-dai.1"; + return "imx-ssi.1"; case MX31_AUDMUX_PORT3_SSI_PINS_3: return "SSI3"; case MX31_AUDMUX_PORT4_SSI_PINS_4: diff --git a/sound/soc/imx/eukrea-tlv320.c b/sound/soc/imx/eukrea-tlv320.c index 807f736..b596752 100644 --- a/sound/soc/imx/eukrea-tlv320.c +++ b/sound/soc/imx/eukrea-tlv320.c @@ -82,7 +82,7 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = { .codec_dai = "tlv320aic23-hifi", .platform_name = "imx-pcm-audio.0", .codec_name = "tlv320aic23-codec.0-001a", - .cpu_dai = "imx-ssi-dai.0", + .cpu_dai = "imx-ssi.0", .ops = &eukrea_tlv320_snd_ops, }; diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c index 26716e9..d4bd345 100644 --- a/sound/soc/imx/imx-ssi.c +++ b/sound/soc/imx/imx-ssi.c @@ -734,7 +734,7 @@ static struct platform_driver imx_ssi_driver = { .remove = __devexit_p(imx_ssi_remove), .driver = { - .name = "imx-ssi-dai", + .name = "imx-ssi", .owner = THIS_MODULE, }, }; diff --git a/sound/soc/imx/phycore-ac97.c b/sound/soc/imx/phycore-ac97.c index 65f0f99..6a65dd7 100644 --- a/sound/soc/imx/phycore-ac97.c +++ b/sound/soc/imx/phycore-ac97.c @@ -34,7 +34,7 @@ static struct snd_soc_dai_link imx_phycore_dai_ac97[] = { .stream_name = "HiFi", .codec_dai_name = "wm9712-hifi", .codec_name = "wm9712-codec", - .cpu_dai_name = "imx-ssi-dai.0", + .cpu_dai_name = "imx-ssi.0", .platform_name = "imx-fiq-pcm-audio.0", .ops = &imx_phycore_hifi_ops, }, diff --git a/sound/soc/imx/wm1133-ev1.c b/sound/soc/imx/wm1133-ev1.c index 7406863..30fdb15 100644 --- a/sound/soc/imx/wm1133-ev1.c +++ b/sound/soc/imx/wm1133-ev1.c @@ -243,7 +243,7 @@ static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd) static struct snd_soc_dai_link wm1133_ev1_dai = { .name = "WM1133-EV1", .stream_name = "Audio", - .cpu_dai_name = "imx-ssi-dai.0", + .cpu_dai_name = "imx-ssi.0", .codec_dai_name = "wm8350-hifi", .platform_name = "imx-fiq-pcm-audio.0", .codec_name = "wm8350-codec.0-0x1a", -- 1.7.1

3 2

[alsa-devel] ASoC updates for 2.6.37
by Mark Brown 30 Sep '10

30 Sep '10

The following changes since commit 45e655047fd64ba7eb52d14ef5acc41763c8ea34: ASoC: Initial WM8962 IRQ support (2010-09-29 00:32:36 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.37 Dimitris Papastamos (2): ASoC: Remove unneeded use of spi_bus_type ASoC: WM8804: Initial driver Mark Brown (2): ASoC: Mark WM8962 Additional Control 4 register as volatile ASoC: Provide microphone bias configuration for WM8962 include/sound/wm8962.h | 6 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/wm8510.c | 1 - sound/soc/codecs/wm8711.c | 1 - sound/soc/codecs/wm8728.c | 1 - sound/soc/codecs/wm8731.c | 1 - sound/soc/codecs/wm8750.c | 1 - sound/soc/codecs/wm8753.c | 1 - sound/soc/codecs/wm8776.c | 1 - sound/soc/codecs/wm8804.c | 820 ++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/wm8804.h | 61 +++ sound/soc/codecs/wm8900.c | 1 - sound/soc/codecs/wm8962-tables.c | 2 +- sound/soc/codecs/wm8962.c | 12 + sound/soc/codecs/wm8985.c | 1 - sound/soc/codecs/wm8988.c | 1 - 17 files changed, 906 insertions(+), 11 deletions(-) create mode 100644 sound/soc/codecs/wm8804.c create mode 100644 sound/soc/codecs/wm8804.h

2 1

[alsa-devel] [PATCH] ASoC: Remove unneeded use of spi_bus_type
by Dimitris Papastamos 30 Sep '10

30 Sep '10

No need to explicitly set the bus type, spi_register_driver does that for us. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8510.c | 1 - sound/soc/codecs/wm8711.c | 1 - sound/soc/codecs/wm8728.c | 1 - sound/soc/codecs/wm8731.c | 1 - sound/soc/codecs/wm8750.c | 1 - sound/soc/codecs/wm8753.c | 1 - sound/soc/codecs/wm8776.c | 1 - sound/soc/codecs/wm8900.c | 1 - sound/soc/codecs/wm8985.c | 1 - sound/soc/codecs/wm8988.c | 1 - 10 files changed, 0 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index 02ecf54..8f10709 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c @@ -627,7 +627,6 @@ static int __devexit wm8510_spi_remove(struct spi_device *spi) static struct spi_driver wm8510_spi_driver = { .driver = { .name = "wm8510", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8510_spi_probe, diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c index 52a923a..54fbd76 100644 --- a/sound/soc/codecs/wm8711.c +++ b/sound/soc/codecs/wm8711.c @@ -453,7 +453,6 @@ static int __devexit wm8711_spi_remove(struct spi_device *spi) static struct spi_driver wm8711_spi_driver = { .driver = { .name = "wm8711-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8711_spi_probe, diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c index 32eba85..075f35e 100644 --- a/sound/soc/codecs/wm8728.c +++ b/sound/soc/codecs/wm8728.c @@ -307,7 +307,6 @@ static int __devexit wm8728_spi_remove(struct spi_device *spi) static struct spi_driver wm8728_spi_driver = { .driver = { .name = "wm8728-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8728_spi_probe, diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index bdce125..6313858 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -600,7 +600,6 @@ static int __devexit wm8731_spi_remove(struct spi_device *spi) static struct spi_driver wm8731_spi_driver = { .driver = { .name = "wm8731-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8731_spi_probe, diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 4d1ec9d..6c924cd 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c @@ -782,7 +782,6 @@ static int __devexit wm8750_spi_remove(struct spi_device *spi) static struct spi_driver wm8750_spi_driver = { .driver = { .name = "wm8750-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8750_spi_probe, diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 64ea066..8f679a1 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1651,7 +1651,6 @@ static int __devexit wm8753_spi_remove(struct spi_device *spi) static struct spi_driver wm8753_spi_driver = { .driver = { .name = "wm8753-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8753_spi_probe, diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index c0b6917..04182c4 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c @@ -483,7 +483,6 @@ static int __devexit wm8776_spi_remove(struct spi_device *spi) static struct spi_driver wm8776_spi_driver = { .driver = { .name = "wm8776-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8776_spi_probe, diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index 25c8ccd..b4f1172 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c @@ -1291,7 +1291,6 @@ static int __devexit wm8900_spi_remove(struct spi_device *spi) static struct spi_driver wm8900_spi_driver = { .driver = { .name = "wm8900-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8900_spi_probe, diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index bd109c4..04ec1fe 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c @@ -1145,7 +1145,6 @@ static int __devexit wm8985_spi_remove(struct spi_device *spi) static struct spi_driver wm8985_spi_driver = { .driver = { .name = "wm8985", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8985_spi_probe, diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index d08b1fe..d7f2597 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c @@ -844,7 +844,6 @@ static int __devexit wm8988_spi_remove(struct spi_device *spi) static struct spi_driver wm8988_spi_driver = { .driver = { .name = "wm8988-codec", - .bus = &spi_bus_type, .owner = THIS_MODULE, }, .probe = wm8988_spi_probe, -- 1.7.3

3 2

[alsa-devel] ALC662 NID 0x09 is not unmuted anymore - intentional?
by Valentine Sinitsyn 30 Sep '10

30 Sep '10

Hello, I happened to spend last couple of evenings figuring out what's wrong with microphone on my laptop (Lenovo Y550P, in case you are interested in). It has Intel HDA soundcard with Realtek 272 codec. No, I'm not going to ask for a help on devel mailing list, at the very least because I know what's wrong myself. But this knowledge poses some questions regarding snd-hda-intel kenel driver (more precisely, patch_realtek.c, which is part of it) I want to clarify. Anyway, sorry for the long intro :) It quickly appeared that AUD_IN widget of the codec (NID 0x09) has no way to be unmuted - its input amplifier is muted at the very beginning of alc662_init_verbs and is not connected to any ALSA control (maybe it should). I remembered the mic was working some time ago, so I've skimmed through kernel versions and found the offending commit: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdi… One can clearly see from it that before it was applied (i.e. Linux 2.6.34), this widget was unmuted in alc662_auto_init_verbs (thus it happened to every auto-configured card, including mine), but it is not unmuted anymore (as far as I can see, for any model except maybe ecs - I haven't dug into this too much). The question is if it is intentional (i.e. there should be some ALSA switch connected to 0x09 input amplifier) or is it a bug? Thanks for the explanations. -- Regards, Valentine Sinitsyn

2 1

[alsa-devel] ALSA AUDIOj support for PXA320
by Sayiram K N 30 Sep '10

30 Sep '10

Hi All I am using PXA320 where it has ALSA . but for Linux 2.6.29 there is no support for PXA320. can i get a patch to support PXA320 . thanks in advance BR Sayiram K N

2 1

[alsa-devel] [PATCH] ASoC: WM8985: Register notifier for the regulator being disabled
by Dimitris Papastamos 30 Sep '10

30 Sep '10

Make sure we get an event when the regulator is disabled so we know we have to sync the cache afterwards. Minor stylistic changes. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8985.c | 51 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 47 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index 6116b42..bd109c4 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c @@ -126,11 +126,35 @@ static const int volume_update_regs[] = { struct wm8985_priv { enum snd_soc_control_type control_type; + struct snd_soc_codec *codec; struct regulator_bulk_data supplies[WM8985_NUM_SUPPLIES]; + struct notifier_block disable_nb[WM8985_NUM_SUPPLIES]; unsigned int sysclk; unsigned int bclk; }; +/* + * We can't use the same notifier block for more than one supply and + * there's no way I can see to get from a callback to the caller + * except container_of(). + */ +#define WM8985_REGULATOR_EVENT(n) \ +static int wm8985_regulator_event_##n(struct notifier_block *nb, \ + unsigned long event, void *data) \ +{ \ + struct wm8985_priv *wm8985 = container_of(nb, struct wm8985_priv, \ + disable_nb[n]); \ + if (event & REGULATOR_EVENT_DISABLE) { \ + wm8985->codec->cache_sync = 1; \ + } \ + return 0; \ +} + +WM8985_REGULATOR_EVENT(0) +WM8985_REGULATOR_EVENT(1) +WM8985_REGULATOR_EVENT(2) +WM8985_REGULATOR_EVENT(3) + static const struct { int div; int ratio; @@ -782,7 +806,7 @@ static int wm8985_set_pll(struct snd_soc_dai *dai, int pll_id, { int ret; struct snd_soc_codec *codec; - struct pll_div pll_div; + struct pll_div pll_div = { 0 }; codec = dai->codec; if (freq_in && freq_out) { @@ -794,7 +818,7 @@ static int wm8985_set_pll(struct snd_soc_dai *dai, int pll_id, /* disable the PLL before reprogramming it */ snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1, WM8985_PLLEN_MASK, 0); - + if (!freq_in || !freq_out) return 0; @@ -932,8 +956,6 @@ static int wm8985_set_bias_level(struct snd_soc_codec *codec, snd_soc_write(codec, WM8985_POWER_MANAGEMENT_2, 0); snd_soc_write(codec, WM8985_POWER_MANAGEMENT_3, 0); - codec->cache_sync = 1; - regulator_bulk_disable(ARRAY_SIZE(wm8985->supplies), wm8985->supplies); break; @@ -963,9 +985,13 @@ static int wm8985_resume(struct snd_soc_codec *codec) static int wm8985_remove(struct snd_soc_codec *codec) { struct wm8985_priv *wm8985; + int i; wm8985 = snd_soc_codec_get_drvdata(codec); wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF); + for (i = 0; i < ARRAY_SIZE(wm8985->supplies); i++) + regulator_unregister_notifier(wm8985->supplies[i].consumer, + &wm8985->disable_nb[i]); regulator_bulk_free(ARRAY_SIZE(wm8985->supplies), wm8985->supplies); return 0; } @@ -978,6 +1004,7 @@ static int wm8985_probe(struct snd_soc_codec *codec) u16 *cache; wm8985 = snd_soc_codec_get_drvdata(codec); + wm8985->codec = codec; ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8985->control_type); if (ret < 0) { @@ -995,6 +1022,22 @@ static int wm8985_probe(struct snd_soc_codec *codec) return ret; } + wm8985->disable_nb[0].notifier_call = wm8985_regulator_event_0; + wm8985->disable_nb[1].notifier_call = wm8985_regulator_event_1; + wm8985->disable_nb[2].notifier_call = wm8985_regulator_event_2; + wm8985->disable_nb[3].notifier_call = wm8985_regulator_event_3; + + /* This should really be moved into the regulator core */ + for (i = 0; i < ARRAY_SIZE(wm8985->supplies); i++) { + ret = regulator_register_notifier(wm8985->supplies[i].consumer, + &wm8985->disable_nb[i]); + if (ret != 0) { + dev_err(codec->dev, + "Failed to register regulator notifier: %d\n", + ret); + } + } + ret = regulator_bulk_enable(ARRAY_SIZE(wm8985->supplies), wm8985->supplies); if (ret) { -- 1.7.3

2 3

[alsa-devel] [PATCH 1/2] ASoC: Mark WM8962 Additional Control 4 register as volatile
by Mark Brown 30 Sep '10

30 Sep '10

There are some status bits for microphone detection in here. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8962-tables.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8962-tables.c b/sound/soc/codecs/wm8962-tables.c index f21a8c1..6fa98ea 100644 --- a/sound/soc/codecs/wm8962-tables.c +++ b/sound/soc/codecs/wm8962-tables.c @@ -21204,7 +21204,7 @@ const struct wm8962_reg_access wm8962_reg_access[WM8962_MAX_REGISTER + 1] = { { 0x0000, 0x0000, 0x0000 }, /* R45 */ { 0x0000, 0x0000, 0x0000 }, /* R46 */ { 0x000F, 0x0000, 0x0000 }, /* R47 - Thermal Shutdown Status */ - { 0x7EC7, 0x7E07, 0x0000 }, /* R48 - Additional Control (4) */ + { 0x7EC7, 0x7E07, 0xFFFF }, /* R48 - Additional Control (4) */ { 0x00D3, 0x00D7, 0xFFFF }, /* R49 - Class D Control 1 */ { 0x0000, 0x0000, 0x0000 }, /* R50 */ { 0x0047, 0x0047, 0x0000 }, /* R51 - Class D Control 2 */ -- 1.7.1

2 2

[alsa-devel] via_dmapos_patch
by David Henningsson 30 Sep '10

30 Sep '10

I'm researching a few bugs where the user claims position_fix=1 helps the problem, but adding the quirk for that model surprisingly didn't. So looking at the code, I concluded that the difference was via_dmapos_patch, and that they all had via_dmapos_patch=1, and that via_dmapos_patch=0 helped them solve the problem. Three out of five (not all of them have reported back on via_dmapos_patch=0 yet) are VIA controllers rev 10. So we now have VIA controllers that need via_dmapos_patch=0. I can think of a few approaches here: 1) since position_fix=1 implicitly sets via_dmapos_patch to 0 (maybe unintentionally), we should add a position_fix=3 meaning lpib + via_dmapos_patch=1 2) figure if something has changed recently (as in "within the last year"...) that has made via_dmapos_patch=1 work worse than before 3) figure out if there are several ATI/VIA controllers that actually never wants the patch. Any thoughts? -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

2 3

[PATCH] ALSA: HDA: Add position_fix=3 module option, and refactor related code
by David Henningsson 30 Sep '10

30 Sep '10

What was previously known as via_dmapos_patch, and hard-coded to be used for VIA and ATI controllers, is now configurable through a module option. The background is that some VIA controllers seem to prefer via_dmapos_patch to be turned off. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- Documentation/sound/alsa/HD-Audio.txt | 8 ++++-- sound/pci/hda/hda_intel.c | 41 +++++++++++++++----------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt index 278cc21..7d58e60 100644 --- a/Documentation/sound/alsa/HD-Audio.txt +++ b/Documentation/sound/alsa/HD-Audio.txt @@ -57,9 +57,11 @@ dead. However, this detection isn't perfect on some devices. In such a case, you can change the default method via `position_fix` option. `position_fix=1` means to use LPIB method explicitly. -`position_fix=2` means to use the position-buffer. 0 is the default -value, the automatic check and fallback to LPIB as described in the -above. If you get a problem of repeated sounds, this option might +`position_fix=2` means to use the position-buffer. +`position_fix=3` means to use a combination of both methods, needed +for some VIA and ATI controllers. 0 is the default value for all other +controllers, the automatic check and fallback to LPIB as described in +the above. If you get a problem of repeated sounds, this option might help. In addition to that, every controller is known to be broken regarding diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index ec07e47..38b063e 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -78,8 +78,8 @@ MODULE_PARM_DESC(enable, "Enable Intel HD audio interface."); module_param_array(model, charp, NULL, 0444); MODULE_PARM_DESC(model, "Use the given board model."); module_param_array(position_fix, int, NULL, 0444); -MODULE_PARM_DESC(position_fix, "Fix DMA pointer " - "(0 = auto, 1 = none, 2 = POSBUF)."); +MODULE_PARM_DESC(position_fix, "DMA pointer read method." + "(0 = auto, 1 = LPIB, 2 = POSBUF, 3 = VIACOMBO)."); module_param_array(bdl_pos_adj, int, NULL, 0644); MODULE_PARM_DESC(bdl_pos_adj, "BDL position adjustment offset."); module_param_array(probe_mask, int, NULL, 0444); @@ -305,6 +305,7 @@ enum { POS_FIX_AUTO, POS_FIX_LPIB, POS_FIX_POSBUF, + POS_FIX_VIACOMBO, }; /* Defines for ATI HD Audio support in SB450 south bridge */ @@ -433,7 +434,6 @@ struct azx { unsigned int polling_mode :1; unsigned int msi :1; unsigned int irq_pending_warned :1; - unsigned int via_dmapos_patch :1; /* enable DMA-position fix for VIA */ unsigned int probing :1; /* codec probing phase */ /* for debugging */ @@ -1309,11 +1309,8 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev) azx_sd_writel(azx_dev, SD_BDLPU, upper_32_bits(azx_dev->bdl.addr)); /* enable the position buffer */ - if (chip->position_fix[0] == POS_FIX_POSBUF || - chip->position_fix[0] == POS_FIX_AUTO || - chip->position_fix[1] == POS_FIX_POSBUF || - chip->position_fix[1] == POS_FIX_AUTO || - chip->via_dmapos_patch) { + if (chip->position_fix[0] != POS_FIX_LPIB || + chip->position_fix[1] != POS_FIX_LPIB) { if (!(azx_readl(chip, DPLBASE) & ICH6_DPLBASE_ENABLE)) azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr | ICH6_DPLBASE_ENABLE); @@ -1852,20 +1849,21 @@ static unsigned int azx_get_position(struct azx *chip, struct azx_dev *azx_dev) { unsigned int pos; + int stream = azx_dev->substream->stream; - if (chip->via_dmapos_patch) + switch (chip->position_fix[stream]) { + case POS_FIX_LPIB: + /* read LPIB */ + pos = azx_sd_readl(azx_dev, SD_LPIB); + break; + case POS_FIX_VIACOMBO: pos = azx_via_get_position(chip, azx_dev); - else { - int stream = azx_dev->substream->stream; - if (chip->position_fix[stream] == POS_FIX_POSBUF || - chip->position_fix[stream] == POS_FIX_AUTO) { - /* use the position buffer */ - pos = le32_to_cpu(*azx_dev->posbuf); - } else { - /* read LPIB */ - pos = azx_sd_readl(azx_dev, SD_LPIB); - } + break; + default: + /* use the position buffer */ + pos = le32_to_cpu(*azx_dev->posbuf); } + if (pos >= azx_dev->bufsize) pos = 0; return pos; @@ -2313,6 +2311,7 @@ static int __devinit check_position_fix(struct azx *chip, int fix) switch (fix) { case POS_FIX_LPIB: case POS_FIX_POSBUF: + case POS_FIX_VIACOMBO: return fix; } @@ -2320,11 +2319,9 @@ static int __devinit check_position_fix(struct azx *chip, int fix) switch (chip->driver_type) { case AZX_DRIVER_VIA: case AZX_DRIVER_ATI: - chip->via_dmapos_patch = 1; /* Use link position directly, avoid any transfer problem. */ - return POS_FIX_LPIB; + return POS_FIX_VIACOMBO; } - chip->via_dmapos_patch = 0; q = snd_pci_quirk_lookup(chip->pci, position_fix_list); if (q) { -- 1.7.1 --------------010901080501010700060808--

1 0

[alsa-devel] ASoC updates for 2.6.37
by Mark Brown 30 Sep '10

30 Sep '10

The following changes since commit cf1ff5011614cad540fa872b46552d078b510c38: ASoC: Fix a compile warning for printk format (2010-09-27 08:18:13 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.37 Dimitris Papastamos (1): ASoC: WM8985: Use the correct macro for the kcontrol defined Mark Brown (3): ASoC: Fix masking of WM8962 FLL1 register ASoC: Lowercase WM8962 CODEC name ASoC: Initial WM8962 IRQ support include/sound/wm8962.h | 2 + sound/soc/codecs/wm8962.c | 64 ++++++++++++++++++++++++++++++++++++++++++-- sound/soc/codecs/wm8985.c | 4 +- 3 files changed, 65 insertions(+), 5 deletions(-)

2 1