May 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v6 0/2] ASoC: CX2072X codec support (revised, v6)
by Takashi Iwai 23 May '19

23 May '19

Hi, the merge window was closed, and now it's time for fun again. This is a v6 revision of ASoC CX2072X codec support patchset for Intel platforms. Takashi === v5->v6: Drop buggy&untested EQ and DRC codes Lots of code reduction/cleanup in codec driver Add more comments about platform-specific stuff v4->v5: Move clk management to runtime PM Sparse warning fixes Some more code simplification Drop tricky regcache fiddling Apply mutex locks around possible racy sequences Move exported jack detection stuff into set_jack callback v3->v4: Fix the wrong endianess conversion in reg write Minor code cleanups v2->v3: CX2072X codec driver: * Move register tables to appropriate place * Remove some confusing codes * Set snd_ctl_boolean_* helpers directly * Fix EQ put callback * Rename to "DAC1 Switch" from "DAC1 Mute Switch" * Drop superfluous regmap calls at shutdown * Avoid regmap_register_patch() * Add missing register definitions * Fix register access on big-endian machine * Remove regcache messes CX2072X machine driver: * Add Pierre's ack * Drop superfluous ssp0 routes v1->v2: Uncomment SOF entries in ACPI binding Move snd_soc_dai_set_bclk_ratio() call into init callback The original cover letter is below: === It's been long time ago the first version of CX2072X codec patch was submitted, and I hoped that it'd be resubmitted, but never happened, as the original author seems to have left, unfortunately. Since I have such a laptop (ASUS E200HA), I took some time to cook and brush up the patches. The patches are for 5.2, should be applicable to ASoC tree for-next branch. Will post the corresponding UCM profile patch once when this gets accepted. thanks, Takashi === Simon Ho (1): ASoC: Add support for Conexant CX2072X CODEC Takashi Iwai (1): ASoC: Intel: Add machine driver for CX2072X on BYT/CHT platforms sound/soc/codecs/Kconfig | 7 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cx2072x.c | 1727 +++++++++++++++++++++ sound/soc/codecs/cx2072x.h | 314 ++++ sound/soc/intel/boards/Kconfig | 11 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/bytcht_cx2072x.c | 262 ++++ sound/soc/intel/common/soc-acpi-intel-byt-match.c | 8 + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 + 9 files changed, 2341 insertions(+) create mode 100644 sound/soc/codecs/cx2072x.c create mode 100644 sound/soc/codecs/cx2072x.h create mode 100644 sound/soc/intel/boards/bytcht_cx2072x.c -- 2.16.4

2 5

[alsa-devel] [PATCH] ASoC: mediatek: mt8183: remove unused DAPM pins
by Tzung-Bi Shih 23 May '19

23 May '19

Kernel emits the following messages when booting. ASoC: DAPM unknown pin Headset Mic ASoC: DAPM unknown pin Headphone Remove the unused DAPM pins. Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> --- .../soc/mediatek/mt8183/mt8183-da7219-max98357.c | 15 +-------------- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 16 +--------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c index 31ea8632c397..231fb49d79b9 100644 --- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c @@ -18,18 +18,6 @@ static struct snd_soc_jack headset_jack; -/* Headset jack detection DAPM pins */ -static struct snd_soc_jack_pin headset_jack_pins[] = { - { - .pin = "Headphone", - .mask = SND_JACK_HEADPHONE, - }, - { - .pin = "Headset Mic", - .mask = SND_JACK_MICROPHONE, - }, -}; - static struct snd_soc_dai_link_component mt8183_da7219_max98357_external_codecs[] = { { @@ -375,8 +363,7 @@ mt8183_da7219_max98357_headset_init(struct snd_soc_component *component) SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3, &headset_jack, - headset_jack_pins, - ARRAY_SIZE(headset_jack_pins)); + NULL, 0); if (ret) return ret; diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index 4e44e5689d6f..1ba7aa58e4b6 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -17,19 +17,6 @@ static struct snd_soc_jack headset_jack; -/* Headset jack detection DAPM pins */ -static struct snd_soc_jack_pin headset_jack_pins[] = { - { - .pin = "Headphone", - .mask = SND_JACK_HEADPHONE, - }, - { - .pin = "Headset Mic", - .mask = SND_JACK_MICROPHONE, - }, - -}; - static int mt8183_mt6358_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -328,8 +315,7 @@ mt8183_mt6358_ts3a227_max98357_headset_init(struct snd_soc_component *component) SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3, &headset_jack, - headset_jack_pins, - ARRAY_SIZE(headset_jack_pins)); + NULL, 0); if (ret) return ret; -- 2.21.0.1020.gf2820cf01a-goog

2 1

[alsa-devel] [PATCH] ASoC: mediatek: mt8183: move card registration to the end of probe
by Tzung-Bi Shih 23 May '19

23 May '19

mt8183_mt6358_ts3a227_max98357_dev_probe() does not return immediately if devm_snd_soc_register_card() returns fail. As a result, the rest of code still get executed. Two options to fix: 1. add an extra return statement if devm_snd_soc_register_card() returns fail 2. move devm_snd_soc_register_card() to the end of probe Adopt option 2 which is more clear and common. Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> --- .../soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index 4e44e5689d6f..1efc7f5d04e4 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -345,7 +345,7 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) struct device_node *platform_node; struct snd_soc_dai_link *dai_link; struct pinctrl *default_pins; - int ret, i; + int i; card->dev = &pdev->dev; @@ -380,11 +380,6 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) return -EINVAL; } - ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret) - dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", - __func__, ret); - default_pins = devm_pinctrl_get_select(&pdev->dev, PINCTRL_STATE_DEFAULT); if (IS_ERR(default_pins)) { @@ -393,7 +388,7 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) return PTR_ERR(default_pins); } - return ret; + return devm_snd_soc_register_card(&pdev->dev, card); } #ifdef CONFIG_OF -- 2.21.0.1020.gf2820cf01a-goog

2 1

[alsa-devel] [RFC PATCH] ASoC: simple-card: Fix configuration of DAI format
by Jon Hunter 23 May '19

23 May '19

When configuring a codec to be both bit-clock and frame-master, it was found that the codec was always configured as bit-clock and frame-slave. Looking at the simple_dai_link_of() function there appears to be two problems with the configuration of the DAI format, which are ... 1. The function asoc_simple_parse_daifmt() is called before the function asoc_simple_parse_codec() and this means that the device-tree node for the codec has not been parsed yet, which is needed by the function asoc_simple_parse_daifmt() to determine who is the codec. 2. The phandle passed to asoc_simple_parse_daifmt() is the phandle to the 'codec' node and not the phandle of the actual codec defined by the 'sound-dai' property under the 'codec' node. Fix the above by moving the call to asoc_simple_parse_daifmt() after the the call to asoc_simple_parse_codec() and pass the phandle for the codec to asoc_simple_parse_daifmt(). Signed-off-by: Jon Hunter <jonathanh(a)nvidia.com> --- sound/soc/generic/simple-card.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 9b568f578bcd..c2c8dcbcf795 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -283,11 +283,6 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv, codec_dai = dai_props->codec_dai = &priv->dais[li->dais++]; - ret = asoc_simple_parse_daifmt(dev, node, codec, - prefix, &dai_link->dai_fmt); - if (ret < 0) - goto dai_link_of_err; - simple_parse_mclk_fs(top, cpu, codec, dai_props, prefix); ret = asoc_simple_parse_cpu(cpu, dai_link, &single_cpu); @@ -298,6 +293,11 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv, if (ret < 0) goto dai_link_of_err; + ret = asoc_simple_parse_daifmt(dev, node, dai_link->codecs->of_node, + prefix, &dai_link->dai_fmt); + if (ret < 0) + goto dai_link_of_err; + ret = asoc_simple_parse_platform(plat, dai_link); if (ret < 0) goto dai_link_of_err; -- 2.7.4

2 3

[alsa-devel] [PATCH] ASoC: sound/soc/intel/boards: limit some drivers to X86 since headers are only in arch/x86/
by Randy Dunlap 23 May '19

23 May '19

From: Randy Dunlap <rdunlap(a)infradead.org> Several drivers in sound/soc/intel/boards/ #include header files that only exist in arch/x86/include/asm. This causes build errors, so make these drivers depend on X86. Fixes these build errors (on ia64): ../sound/soc/intel/boards/bxt_da7219_max98357a.c:19:10: fatal error: asm/cpu_device_id.h: No such file or directory #include <asm/cpu_device_id.h> ../sound/soc/intel/boards/bytcr_rt5640.c:31:10: fatal error: asm/cpu_device_id.h: No such file or directory #include <asm/cpu_device_id.h> ../sound/soc/intel/boards/bytcr_rt5651.c:33:10: fatal error: asm/cpu_device_id.h: No such file or directory #include <asm/cpu_device_id.h> ../sound/soc/intel/boards/cht_bsw_rt5645.c:29:10: fatal error: asm/cpu_device_id.h: No such file or directory #include <asm/cpu_device_id.h> ../sound/soc/intel/boards/bytcht_es8316.c:33:10: fatal error: asm/cpu_device_id.h: No such file or directory #include <asm/cpu_device_id.h> ../sound/soc/intel/boards/bytcht_da7213.c:26:10: fatal error: asm/platform_sst_audio.h: No such file or directory #include <asm/platform_sst_audio.h> And more drivers determined by: > grep "include.*asm.cpu_device_id.h" *.c bxt_da7219_max98357a.c:#include <asm/cpu_device_id.h> bytcht_es8316.c:#include <asm/cpu_device_id.h> bytcr_rt5640.c:#include <asm/cpu_device_id.h> bytcr_rt5651.c:#include <asm/cpu_device_id.h> cht_bsw_rt5645.c:#include <asm/cpu_device_id.h> sof_rt5682.c:#include <asm/cpu_device_id.h> and > grep "include.*asm.platform_sst_audio.h" *.c bytcht_da7213.c:#include <asm/platform_sst_audio.h> bytcht_es8316.c:#include <asm/platform_sst_audio.h> Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Mark Brown <broonie(a)kernel.org> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Cc: Jie Yang <yang.jie(a)linux.intel.com> Cc: alsa-devel(a)alsa-project.org --- sound/soc/intel/boards/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+) --- lnx-52-rc1.orig/sound/soc/intel/boards/Kconfig +++ lnx-52-rc1/sound/soc/intel/boards/Kconfig @@ -87,6 +87,7 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH tristate "Baytrail and Baytrail-CR with RT5640 codec" depends on I2C && ACPI depends on X86_INTEL_LPSS || COMPILE_TEST + depends on X86 select SND_SOC_ACPI select SND_SOC_RT5640 help @@ -99,6 +100,7 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH tristate "Baytrail and Baytrail-CR with RT5651 codec" depends on I2C && ACPI depends on X86_INTEL_LPSS || COMPILE_TEST + depends on X86 select SND_SOC_ACPI select SND_SOC_RT5651 help @@ -123,6 +125,7 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH tristate "Cherrytrail & Braswell with RT5645/5650 codec" depends on I2C && ACPI depends on X86_INTEL_LPSS || COMPILE_TEST + depends on X86 select SND_SOC_ACPI select SND_SOC_RT5645 help @@ -159,6 +162,7 @@ config SND_SOC_INTEL_BYT_CHT_DA7213_MACH tristate "Baytrail & Cherrytrail with DA7212/7213 codec" depends on I2C && ACPI depends on X86_INTEL_LPSS || COMPILE_TEST + depends on X86 select SND_SOC_ACPI select SND_SOC_DA7213 help @@ -171,6 +175,7 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH tristate "Baytrail & Cherrytrail with ES8316 codec" depends on I2C && ACPI depends on X86_INTEL_LPSS || COMPILE_TEST + depends on X86 select SND_SOC_ACPI select SND_SOC_ES8316 help @@ -249,6 +254,7 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357 tristate "Broxton with DA7219 and MAX98357A in I2S Mode" depends on I2C && ACPI depends on MFD_INTEL_LPSS || COMPILE_TEST + depends on X86 select SND_SOC_DA7219 select SND_SOC_MAX98357A select SND_SOC_DMIC

3 2

[alsa-devel] [PATCH] ALSA: Enable micmute LED for Huawei laptops
by Ayman Bagabas 23 May '19

23 May '19

Since this LED is found on all Huawei laptops, we can hook it to huawei-wmi platform driver to control it. Also, some renames have been made to use product name instead of common name to avoid confusions. Signed-off-by: Ayman Bagabas <ayman.bagabas(a)gmail.com> --- sound/pci/hda/patch_realtek.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index f83f21d64dd4..ab6a856ec614 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5747,7 +5747,7 @@ enum { ALC298_FIXUP_TPT470_DOCK, ALC255_FIXUP_DUMMY_LINEOUT_VERB, ALC255_FIXUP_DELL_HEADSET_MIC, - ALC256_FIXUP_HUAWEI_MBXP_PINS, + ALC256_FIXUP_HUAWEI_MACH_WX9_PINS, ALC295_FIXUP_HP_X360, ALC221_FIXUP_HP_HEADSET_MIC, ALC285_FIXUP_LENOVO_HEADPHONE_NOISE, @@ -6038,7 +6038,7 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC269_FIXUP_HEADSET_MIC }, - [ALC256_FIXUP_HUAWEI_MBXP_PINS] = { + [ALC256_FIXUP_HUAWEI_MACH_WX9_PINS] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) { {0x12, 0x90a60130}, @@ -7063,9 +7063,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K), SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD), - SND_PCI_QUIRK(0x19e5, 0x3200, "Huawei MBX", ALC255_FIXUP_MIC_MUTE_LED), - SND_PCI_QUIRK(0x19e5, 0x3201, "Huawei MBX", ALC255_FIXUP_MIC_MUTE_LED), - SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MBXP", ALC256_FIXUP_HUAWEI_MBXP_PINS), + SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MACH-WX9", ALC256_FIXUP_HUAWEI_MACH_WX9_PINS), SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */ #if 0 @@ -7124,6 +7122,7 @@ static const struct snd_pci_quirk alc269_fixup_vendor_tbl[] = { SND_PCI_QUIRK_VENDOR(0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED), SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), SND_PCI_QUIRK_VENDOR(0x17aa, "Thinkpad", ALC269_FIXUP_THINKPAD_ACPI), + SND_PCI_QUIRK_VENDOR(0x19e5, "Huawei Matebook", ALC255_FIXUP_MIC_MUTE_LED), {} }; -- 2.20.1

2 1

Re: [alsa-devel] [PATCH] ASoC: fsl_esai: fix the channel swap issue after xrun
by S.j. Wang 23 May '19

23 May '19

Hi > > + /* > > + * Add fifo reset here, because the regcache_sync will > > + * write one more data to ETDR. > > + * Which will cause channel shift. > > Sounds like a bug to me...should fix it first by marking the data registers as > volatile. > The ETDR is a writable register, it is not volatile. Even we change it to Volatile, I don't think we can't avoid this issue. for the regcache_sync Just to write this register, it is correct behavior. Best regards Wang shengjiu

2 1

[alsa-devel] [PATCH - alsa-lib 0/1] pcm_file add missing unlock
by Adam Miartus 23 May '19

23 May '19

previous patches: pcm: file: add support for infile reading in non interleaved mode pcm: file: use snd_pcm_file_areas_read_infile for readi introduced an issue where pcm would not be unlocked on early return Adam Miartus (1): pcm_file: add missing unlock on early return src/pcm/pcm_file.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 2.7.4

2 2

[alsa-devel] [PATCH] soundwire: stream: fix bad unlock balance
by Srinivas Kandagatla 23 May '19

23 May '19

This patch fixes below warning due to unlocking without locking. ===================================== WARNING: bad unlock balance detected! 5.1.0-16506-gc1c383a6f0a2-dirty #1523 Tainted: G W ------------------------------------- aplay/2954 is trying to release lock (&bus->msg_lock) at: do_bank_switch+0x21c/0x480 but there are no more locks to release! Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- drivers/soundwire/stream.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index 544925ff0b40..d16268f30e4f 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -814,7 +814,8 @@ static int do_bank_switch(struct sdw_stream_runtime *stream) goto error; } - mutex_unlock(&bus->msg_lock); + if (mutex_is_locked(&bus->msg_lock)) + utex_unlock(&bus->msg_lock); } return ret; -- 2.21.0

3 6

[alsa-devel] set power_save_node=0 as default
by Kailang 23 May '19

23 May '19

Hi Takashi, I measured power consumption between power_save_node=1 and power_save_node=0. It's almost the same. Codec will enter to runtime suspend and suspend. That pin also will enter to D3. Don't need to enter to D3 by single pin. So, Disable power_save_node as default. It will avoid more issues. Windows Driver also has not this option at runtime PM. Many Thanks. BR, Kailang

2 1