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

[alsa-devel] [PATCH] speaker-test: Support S24_3LE sample format
by Julian Scheel 05 Mar '18

05 Mar '18

Implement support signed 24 bit samples, packed in 3 bytes. Signed-off-by: Julian Scheel <julian(a)jusst.de> --- speaker-test/speaker-test.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c index 46b0589..dbee63f 100644 --- a/speaker-test/speaker-test.c +++ b/speaker-test/speaker-test.c @@ -284,6 +284,7 @@ static const int supported_formats[] = { SND_PCM_FORMAT_S16_LE, SND_PCM_FORMAT_S16_BE, SND_PCM_FORMAT_FLOAT_LE, + SND_PCM_FORMAT_S24_3LE, SND_PCM_FORMAT_S32_LE, SND_PCM_FORMAT_S32_BE, -1 @@ -341,6 +342,19 @@ static void generate_sine(uint8_t *frames, int channel, int count, double *_phas *samp_f++ = 0.0; } break; + case SND_PCM_FORMAT_S24_3LE: + if (chn==channel) { + res = (sin((phase * 2 * M_PI) / max_phase - M_PI)) * generator_scale * 0x7fffff; + ires = res; + *samp8++ = LE_INT(ires); + *samp8++ = LE_INT(ires) >> 8; + *samp8++ = LE_INT(ires) >> 16; + } else { + *samp8++ = 0; + *samp8++ = 0; + *samp8++ = 0; + } + break; case SND_PCM_FORMAT_S32_LE: if (chn==channel) { res = (sin((phase * 2 * M_PI) / max_phase - M_PI)) * generator_scale * 0x7fffffff; @@ -415,6 +429,19 @@ static void generate_pink_noise( uint8_t *frames, int channel, int count) { *samp16++ = 0; } break; + case SND_PCM_FORMAT_S24_3LE: + if (chn==channel) { + res = generate_pink_noise_sample(&pink) * generator_scale * 0x07fffff; + ires = res; + *samp8++ = LE_INT(ires); + *samp8++ = LE_INT(ires) >> 8; + *samp8++ = LE_INT(ires) >> 16; + } else { + *samp8++ = 0; + *samp8++ = 0; + *samp8++ = 0; + } + break; case SND_PCM_FORMAT_S32_LE: if (chn==channel) { res = generate_pink_noise_sample(&pink) * generator_scale * 0x07fffffff; @@ -482,6 +509,17 @@ static void generate_pattern(uint8_t *frames, int channel, int count, int *_patt *samp_f++ = 0.0; } break; + case SND_PCM_FORMAT_S24_3LE: + if (chn==channel) { + *samp8++ = LE_INT(pattern); + *samp8++ = LE_INT(pattern) >> 8; + *samp8++ = LE_INT(pattern) >> 16; + } else { + *samp8++ = 0; + *samp8++ = 0; + *samp8++ = 0; + } + break; case SND_PCM_FORMAT_S32_LE: if (chn==channel) { *samp32++ = LE_INT(pattern); -- 2.16.1

2 1

[alsa-devel] [PATCH] sound/tlv320dac33: Add device tree support
by Pavel Machek 05 Mar '18

05 Mar '18

This adds device tree support to tlv320dac33.c. Signed-off-by: Pavel Machek <pavel(a)ucw.cz> diff --git a/Documentation/devicetree/bindings/sound/tlv320dac33.txt b/Documentation/devicetree/bindings/sound/tlv320dac33.txt new file mode 100644 index 0000000..6cbd311 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/tlv320dac33.txt @@ -0,0 +1,32 @@ +Texas Instruments - tlv320dac33 Codec module + +The tlv320dac33 serial control bus communicates through I2C protocols. + +Required properties: + +- compatible - "ti,tlv320dac33" +- reg - I2C slave address + +Optional properties: + +- power-gpios - gpio pin to power the device, active high + +- interrupts - The interrupt output from the device. +- interrupt-parent - The parent interrupt controller. + +- ti,keep-bclk - Keep the BCLK running in FIFO modes +- ti,burst-bclkdiv - BCLK divider value in burst mode + +Example: + +tlv320dac33: audio-codec@19 { + compatible = "ti,tlv320dac33"; + reg = <0x19>; + + interrupt-parent = <&gpio2>; + interrupts = <21 1>; /* gpio_53, IRQF_TRIGGER_RISING */ + power-gpio = <&gpio2 28 0>; /* gpio_60 */ + + ti,keep-bclk; + ti,burst-bclkdiv = <3>; +}; diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c index 5b94a15..2a0fe06 100644 --- a/sound/soc/codecs/tlv320dac33.c +++ b/sound/soc/codecs/tlv320dac33.c @@ -30,6 +32,7 @@ #include <linux/interrupt.h> #include <linux/gpio.h> #include <linux/regulator/consumer.h> +#include <linux/of_gpio.h> #include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h> @@ -105,7 +108,7 @@ struct tlv320dac33_priv { unsigned int nsample; /* burst read amount from host */ int mode1_latency; /* latency caused by the i2c writes in * us */ - u8 burst_bclkdiv; /* BCLK divider value in burst mode */ + u32 burst_bclkdiv; /* BCLK divider value in burst mode */ unsigned int burst_rate; /* Interface speed in Burst modes */ int keep_bclk; /* Keep the BCLK continuously running @@ -1484,16 +1487,11 @@ static struct snd_soc_dai_driver dac33_dai = { static int dac33_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { - struct tlv320dac33_platform_data *pdata; + struct tlv320dac33_platform_data *pdata = client->dev.platform_data; struct tlv320dac33_priv *dac33; + struct device_node *np = client->dev.of_node; int ret, i; - if (client->dev.platform_data == NULL) { - dev_err(&client->dev, "Platform data not set\n"); - return -ENODEV; - } - pdata = client->dev.platform_data; - dac33 = devm_kzalloc(&client->dev, sizeof(struct tlv320dac33_priv), GFP_KERNEL); if (dac33 == NULL) @@ -1505,10 +1503,26 @@ static int dac33_i2c_probe(struct i2c_client *client, i2c_set_clientdata(client, dac33); - dac33->power_gpio = pdata->power_gpio; - dac33->burst_bclkdiv = pdata->burst_bclkdiv; - dac33->keep_bclk = pdata->keep_bclk; - dac33->mode1_latency = pdata->mode1_latency; + if (pdata) { + dac33->power_gpio = pdata->power_gpio; + dac33->burst_bclkdiv = pdata->burst_bclkdiv; + dac33->keep_bclk = pdata->keep_bclk; + dac33->mode1_latency = pdata->mode1_latency; + } else if (np) { + ret = of_get_named_gpio(np, "power-gpios", 0); + if (ret >= 0) + dac33->power_gpio = ret; + else + dac33->power_gpio = -1; + + if (of_property_read_bool(np, "ti,keep-bclk")) + dac33->keep_bclk = true; + + of_property_read_u32(np, "ti,burst-bclkdiv", &dac33->burst_bclkdiv); + } else { + dev_err(&client->dev, "Platform data not set\n"); + return -ENODEV; + } if (!dac33->mode1_latency) dac33->mode1_latency = 10000; /* 10ms */ dac33->irq = client->irq; @@ -1574,9 +1588,16 @@ static const struct i2c_device_id tlv320dac33_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, tlv320dac33_i2c_id); +static const struct of_device_id tlv320dac33_of_match[] = { + { .compatible = "ti,tlv320dac33", }, + {}, +}; +MODULE_DEVICE_TABLE(i2c, tlv320dac33_of_match); + static struct i2c_driver tlv320dac33_i2c_driver = { .driver = { .name = "tlv320dac33-codec", + .of_match_table = of_match_ptr(tlv320dac33_of_match), }, .probe = dac33_i2c_probe, .remove = dac33_i2c_remove, -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

5 17

[alsa-devel] [asoc:topic/rt5514 1/3] sound/soc/codecs/rt5514-spi.c:477:70: error: 'DRV_NAME' undeclared
by kbuild test robot 05 Mar '18

05 Mar '18

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/rt5514 head: 890861aa85043cc9d99a01e1bd26883722e95243 commit: 04e8262ac8c3f59599ea6dfe5cd1a039828ea4ad [1/3] ASoC: rt5514: replace codec to component config: x86_64-randconfig-s1-03021352 (attached as .config) compiler: gcc-6 (Debian 6.4.0-9) 6.4.0 20171026 reproduce: git checkout 04e8262ac8c3f59599ea6dfe5cd1a039828ea4ad # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): sound/soc/codecs/rt5514-spi.c: In function 'rt5514_resume': >> sound/soc/codecs/rt5514-spi.c:477:70: error: 'DRV_NAME' undeclared (first use in this function) struct snd_soc_component *component = snd_soc_lookup_component(dev, DRV_NAME); ^~~~~~~~ sound/soc/codecs/rt5514-spi.c:477:70: note: each undeclared identifier is reported only once for each function it appears in vim +/DRV_NAME +477 sound/soc/codecs/rt5514-spi.c 474 475 static int __maybe_unused rt5514_resume(struct device *dev) 476 { > 477 struct snd_soc_component *component = snd_soc_lookup_component(dev, DRV_NAME); 478 struct rt5514_dsp *rt5514_dsp = 479 snd_soc_component_get_drvdata(component); 480 int irq = to_spi_device(dev)->irq; 481 u8 buf[8]; 482 483 if (device_may_wakeup(dev)) 484 disable_irq_wake(irq); 485 486 if (rt5514_dsp) { 487 if (rt5514_dsp->substream) { 488 rt5514_spi_burst_read(RT5514_IRQ_CTRL, (u8 *)&buf, 489 sizeof(buf)); 490 if (buf[0] & RT5514_IRQ_STATUS_BIT) 491 rt5514_schedule_copy(rt5514_dsp); 492 } 493 } 494 495 return 0; 496 } 497 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

2 1

[alsa-devel] [RFC] hda/realtek filtered headphone output
by René Rebe 04 Mar '18

04 Mar '18

Hi all, testing some new laptops, I noticed the headphone frequency response was lacking bass. First I noticed this in the Lenovo T470s, and later I found this also be the case on Surface Pro 2 and 3. The Dell XPS13 may also be affected, but I had to return it before I found out the solution on the other machines: https://www.youtube.com/watch?v=a1YkPtfC4LI I had not yet sent the patch because a) I was too busy and b) I wanted to review this further. As the other day I got a Lenovo ideapad 720s to test with exactly the same issue, here is the current hacked patch: https://svn.exactcode.de/t2/trunk/package/base/linux/surface-audio.patch However, given that all newer realtek codecs that came on my desk are affected, maybe there is something wrong with the hda_auto_parser.c - I did not yet fully grasp all the logic of that. As you can see in the patch and video (…) the problem is the signal routing of NID 0x15 or 0x21 (depending whether it is an older, or newer codec). This is the headphone out, and as far as I can see the auto_parser assigned the index 0 pcm output (NID 0x0c) which result in this filtered frequency response, likely intended for the laptop’s speakers? Using the next NID (I guess that was 0xd?) results in a full frequency response and at least to my ears is immediately hearable and obvious. Without this fixed routing the headphone sounds like a PC speaker in a coke can. So the question for the authors and HDA experts: Can this be fixed in the auto_parser, or is my patch (which btw. has to small unrelated cleanups) modulo potentially some renaming of the enum and function, now that more than the Surface is affected, the way to go? If this can be fixed more generally I would be happy to hear! Greetings from Berlin, René Rebe -- ExactCODE GmbH, Lietzenburger Str. 42, DE-10789 Berlin http://exactcode.com | http://exactscan.com | http://ocrkit.com | http://t2-project.org | http://rene.rebe.de

1 0

[alsa-devel] [PATCH] ALSA: hda - Fix a wrong FIXUP for alc289 on Dell machines
by Hui Wang 03 Mar '18

03 Mar '18

With the alc289, the Pin 0x1b is Headphone-Mic, so we should assign ALC269_FIXUP_DELL4_MIC_NO_PRESENCE rather than ALC225_FIXUP_DELL1_MIC_NO_PRESENCE to it. And this change is suggested by Kailang of Realtek and is verified on the machine. (This fixes the commit 3f2f7c55) Cc: Kailang Yang <kailang(a)realtek.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b9c93fa..7a9a867 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6872,7 +6872,7 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x12, 0x90a60120}, {0x14, 0x90170110}, {0x21, 0x0321101f}), - SND_HDA_PIN_QUIRK(0x10ec0289, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, + SND_HDA_PIN_QUIRK(0x10ec0289, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE, {0x12, 0xb7a60130}, {0x14, 0x90170110}, {0x21, 0x04211020}), -- 2.7.4

2 2

[alsa-devel] regression v4.16 on Nokia N900:/dev/input/event6 aka AV Jack support disappeared
by Pavel Machek 02 Mar '18

02 Mar '18

Hi! In v4.16, AV jack support disappeared. This one is suspect: commit 7be4b5dc7ffa9499ac6ef33a5ffa9ff43f9b7057 Author: Andrew F. Davis <afd(a)ti.com> Date: Wed Nov 29 11:13:59 2017 -0600 ARM: dts: omap3-n900: Fix the audio CODEC's reset pin The correct DT property for specifying a GPIO used for reset is "reset-gpios", fix this here. Fixes: 14e3e295b2b9 ("ARM: dts: omap3-n900: Add TLV320AIC3X support") Signed-off-by: Andrew F. Davis <afd(a)ti.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> How was it tested? It reverts polarity of reset pin, but sound/soc/codecs/tlv320aic3x.c treats those as aliases: ret = of_get_named_gpio(np, "reset-gpios", 0); if (ret >= 0) { aic3x->gpio_reset = ret; } else { ret = of_get_named_gpio(np, "gpio-reset", 0); if (ret > 0) { dev_warn(&i2c->dev, "Using deprecated property \"gpio-r\eset\", please update your DT"); aic3x->gpio_reset = ret; Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

6 19

[alsa-devel] [asoc:topic/intel 22/22] sound/soc/intel/boards/cht_bsw_nau8824.c:137:36: sparse: incorrect type in argument 1 (different base types)
by kbuild test robot 02 Mar '18

02 Mar '18

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/intel head: 3bf045d15f52529e8abe26543dbe22af44efb41a commit: 3bf045d15f52529e8abe26543dbe22af44efb41a [22/22] ASoC: Intel: fix argument error in nau8824 machine reproduce: # apt-get install sparse git checkout 3bf045d15f52529e8abe26543dbe22af44efb41a make ARCH=x86_64 allmodconfig make C=1 CF=-D__CHECK_ENDIAN__ sparse warnings: (new ones prefixed by >>) >> sound/soc/intel/boards/cht_bsw_nau8824.c:137:36: sparse: incorrect type in argument 1 (different base types) @@ expected struct snd_soc_codec *codec @@ got strustruct snd_soc_codec *codec @@ sound/soc/intel/boards/cht_bsw_nau8824.c:137:36: expected struct snd_soc_codec *codec sound/soc/intel/boards/cht_bsw_nau8824.c:137:36: got struct snd_soc_component *component sound/soc/intel/boards/cht_bsw_nau8824.c: In function 'cht_codec_init': sound/soc/intel/boards/cht_bsw_nau8824.c:137:29: error: passing argument 1 of 'nau8824_enable_jack_detect' from incompatible pointer type [-Werror=incompatible-pointer-types] nau8824_enable_jack_detect(component, jack); ^~~~~~~~~ In file included from sound/soc/intel/boards/cht_bsw_nau8824.c:31:0: sound/soc/intel/boards/../../codecs/nau8824.h:474:5: note: expected 'struct snd_soc_codec *' but argument is of type 'struct snd_soc_component *' int nau8824_enable_jack_detect(struct snd_soc_codec *codec, ^~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +137 sound/soc/intel/boards/cht_bsw_nau8824.c 101 102 static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) 103 { 104 struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card); 105 struct snd_soc_jack *jack = &ctx->jack; 106 struct snd_soc_dai *codec_dai = runtime->codec_dai; 107 struct snd_soc_component *component = codec_dai->component; 108 int ret, jack_type; 109 110 /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */ 111 ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xf, 0x1, 4, 24); 112 if (ret < 0) { 113 dev_err(runtime->dev, "can't set codec TDM slot %d\n", ret); 114 return ret; 115 } 116 117 /* NAU88L24 supports 4 butons headset detection 118 * KEY_MEDIA 119 * KEY_VOICECOMMAND 120 * KEY_VOLUMEUP 121 * KEY_VOLUMEDOWN 122 */ 123 jack_type = SND_JACK_HEADPHONE | SND_JACK_BTN_0 | SND_JACK_BTN_1 | 124 SND_JACK_BTN_2 | SND_JACK_BTN_3; 125 ret = snd_soc_card_jack_new(runtime->card, "Headset", jack_type, jack, 126 cht_bsw_jack_pins, ARRAY_SIZE(cht_bsw_jack_pins)); 127 if (ret) { 128 dev_err(runtime->dev, 129 "Headset Jack creation failed %d\n", ret); 130 return ret; 131 } 132 snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_MEDIA); 133 snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); 134 snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); 135 snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); 136 > 137 nau8824_enable_jack_detect(component, jack); 138 139 return ret; 140 } 141 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH 0/6] ASoC: max9867: Driver update
by Ladislav Michl 02 Mar '18

02 Mar '18

Hi, here are first few patches for max9867 codec driver. It is still not enough to make it work (at least for me :)), but lets send cleanups first. I would be happy to read clarification about using continuous rate - see patch 6. Thank you, ladis Ladislav Michl (6): ASoC: max9867: Show Kconfig entry ASoC: max9867: Improve error logging ASoC: max9867: Drop probe function ASoC: max9867: Fix codec capabilities ASoC: max9867: DSP mode ASoC: max9867: Use continuous sample rate sound/soc/codecs/Kconfig | 3 +- sound/soc/codecs/max9867.c | 122 ++++++++++++--------------------------------- sound/soc/codecs/max9867.h | 1 - 3 files changed, 34 insertions(+), 92 deletions(-) -- 2.16.2

2 18

[alsa-devel] [PATCH RESEND] ASoC: max9867: Drop probe function
by Ladislav Michl 02 Mar '18

02 Mar '18

Driver probe function has no use and can be deleted. Signed-off-by: Ladislav Michl <ladis(a)linux-mips.org> --- sound/soc/codecs/max9867.c | 10 ---------- sound/soc/codecs/max9867.h | 1 - 2 files changed, 11 deletions(-) diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c index 99b8035d2fda..3620b38291f0 100644 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -406,17 +406,7 @@ static int max9867_resume(struct device *dev) } #endif -static int max9867_probe(struct snd_soc_component *component) -{ - struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component); - - dev_dbg(component->dev, "max98090_probe\n"); - max9867->component = component; - return 0; -} - static const struct snd_soc_component_driver max9867_component = { - .probe = max9867_probe, .controls = max9867_snd_controls, .num_controls = ARRAY_SIZE(max9867_snd_controls), .dapm_routes = max9867_audio_map, diff --git a/sound/soc/codecs/max9867.h b/sound/soc/codecs/max9867.h index c0aea3d1f2ba..55cd9976ff47 100644 --- a/sound/soc/codecs/max9867.h +++ b/sound/soc/codecs/max9867.h @@ -75,7 +75,6 @@ /* codec private data */ struct max9867_priv { struct regmap *regmap; - struct snd_soc_component *component; unsigned int sysclk; unsigned int pclk; unsigned int master; -- 2.16.2

1 0

[alsa-devel] [PATCH] ASoC: Intel: fix argument error in nau8824 machine
by John Hsu 02 Mar '18

02 Mar '18

Fix the error: passing argument 1 of 'nau8824_enable_jack_detect' from incompatible pointer type nau8824_enable_jack_detect(codec, jack); ^~~~~ Which expects 'struct snd_soc_component *' but argument is of type 'struct snd_soc_codec *' Signed-off-by: John Hsu <KCHSU0(a)nuvoton.com> --- sound/soc/intel/boards/cht_bsw_nau8824.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c index 08d0b81..680f2b3 100644 --- a/sound/soc/intel/boards/cht_bsw_nau8824.c +++ b/sound/soc/intel/boards/cht_bsw_nau8824.c @@ -103,8 +103,8 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) { struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card); struct snd_soc_jack *jack = &ctx->jack; - struct snd_soc_codec *codec = runtime->codec; struct snd_soc_dai *codec_dai = runtime->codec_dai; + struct snd_soc_component *component = codec_dai->component; int ret, jack_type; /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */ @@ -134,7 +134,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); - nau8824_enable_jack_detect(codec, jack); + nau8824_enable_jack_detect(component, jack); return ret; } -- 2.6.4

2 1