August 2016 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 0/2] ALSA: bebob: merge vendor-dependent codes for Yamaha/Terratec
by Takashi Sakamoto 24 Aug '16

24 Aug '16

Hi, This patchset merges vendor-dependent codes for Yamaha/Terratec, because each of these two pairs has the same configuration: - Yamaha GO44 / Terratec Phase 24 FW - Yamaha GO46 / Terratec Phase X24 FW The two companies might once have cooperated to develop some audio and music units on IEEE 1394 bus, based on DM1000E ASIC and BeBoB firmware. This conclusion comes from a reporter of a forum of Ubuntu Japanese Community. Thanks for his help to identify subunit formation and supported stream formats: Jack & Firewireオーディオインターフェイスの設定に関する質問です。 https://forums.ubuntulinux.jp/viewtopic.php?id=18657 Terratec has also produced the other models with DM ASIC series and BeBoB firmware. For the models, vendor-dependent codes are still left. Takashi Sakamoto (2): ALSA: bebob: rename file with vendor-dependent code so that it's for Yamaha/Terratec ALSA: bebob: unify configurations for some models produced by Yamaha/Terratec sound/firewire/bebob/Makefile | 5 ++-- sound/firewire/bebob/bebob.c | 8 +++--- sound/firewire/bebob/bebob.h | 3 +-- sound/firewire/bebob/bebob_terratec.c | 31 ---------------------- .../{bebob_yamaha.c => bebob_yamaha_terratec.c} | 9 ++++--- 5 files changed, 14 insertions(+), 42 deletions(-) rename sound/firewire/bebob/{bebob_yamaha.c => bebob_yamaha_terratec.c} (85%) -- 2.7.4

2 3

[alsa-devel] [PATCH -next] ASoC: samsung: i2s: Add missing clk_disable_unprepare() on error in samsung_i2s_probe()
by Wei Yongjun 24 Aug '16

24 Aug '16

Add the missing clk_disable_unprepare() before return from samsung_i2s_probe() in the error handling case. Signed-off-by: Wei Yongjun <weiyj.lk(a)gmail.com> --- sound/soc/samsung/i2s.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index fa3ff03..7e32cf4 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1318,7 +1318,8 @@ static int samsung_i2s_probe(struct platform_device *pdev) sec_dai = i2s_alloc_dai(pdev, true); if (!sec_dai) { dev_err(&pdev->dev, "Unable to alloc I2S_sec\n"); - return -ENOMEM; + ret = -ENOMEM; + goto err_disable_clk; } sec_dai->lock = &pri_dai->spinlock; @@ -1342,7 +1343,8 @@ static int samsung_i2s_probe(struct platform_device *pdev) if (i2s_pdata && i2s_pdata->cfg_gpio && i2s_pdata->cfg_gpio(pdev)) { dev_err(&pdev->dev, "Unable to configure gpio\n"); - return -EINVAL; + ret = -EINVAL; + goto err_disable_clk; } ret = devm_snd_soc_register_component(&pri_dai->pdev->dev, @@ -1366,6 +1368,8 @@ static int samsung_i2s_probe(struct platform_device *pdev) err_free_dai: if (sec_dai) i2s_free_sec_dai(sec_dai); +err_disable_clk: + clk_disable_unprepare(pri_dai->clk); return ret; }

3 2

[alsa-devel] [PATCH] ASoC: tas5086: fix typo: "Inavlid" -> "Invalid"
by Colin King 24 Aug '16

24 Aug '16

From: Colin Ian King <colin.king(a)canonical.com> trivial typo fix in dev_err message Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/codecs/tas5086.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c index c297b9f..b7de857 100644 --- a/sound/soc/codecs/tas5086.c +++ b/sound/soc/codecs/tas5086.c @@ -387,7 +387,7 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream, val = index_in_array(tas5086_ratios, ARRAY_SIZE(tas5086_ratios), priv->mclk / priv->rate); if (val < 0) { - dev_err(codec->dev, "Inavlid MCLK / Fs ratio\n"); + dev_err(codec->dev, "Invalid MCLK / Fs ratio\n"); return -EINVAL; } -- 2.9.3

2 1

[alsa-devel] [PATCH -next] ASoC: omap-abe-twl6040: Use devm_snd_soc_register_card()
by Wei Yongjun 24 Aug '16

24 Aug '16

From: Wei Yongjun <weiyongjun1(a)huawei.com> Using devm_snd_soc_register_card() can make the code shorter and cleaner. Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- sound/soc/omap/omap-abe-twl6040.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index f61b3b5..89fe95e 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -305,23 +305,14 @@ static int omap_abe_probe(struct platform_device *pdev) snd_soc_card_set_drvdata(card, priv); - ret = snd_soc_register_card(card); + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) - dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", + dev_err(&pdev->dev, "devm_snd_soc_register_card() failed: %d\n", ret); return ret; } -static int omap_abe_remove(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - - snd_soc_unregister_card(card); - - return 0; -} - static const struct of_device_id omap_abe_of_match[] = { {.compatible = "ti,abe-twl6040", }, { }, @@ -335,7 +326,6 @@ static struct platform_driver omap_abe_driver = { .of_match_table = omap_abe_of_match, }, .probe = omap_abe_probe, - .remove = omap_abe_remove, }; static int __init omap_abe_init(void)

3 2

[alsa-devel] [PATCH] ASoC: sunxi: depend on ARCH_SUNXI
by Peter Robinson 24 Aug '16

24 Aug '16

Depend on ARCH_SUNXI or COMPILE_TEST as it doesn't make sense to enable these if the appropriate SoC they're embedded in isn't enabled. Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com> --- sound/soc/sunxi/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/sunxi/Kconfig b/sound/soc/sunxi/Kconfig index 2a954bd..a2b62dc5 100644 --- a/sound/soc/sunxi/Kconfig +++ b/sound/soc/sunxi/Kconfig @@ -2,6 +2,7 @@ menu "Allwinner SoC Audio support" config SND_SUN4I_CODEC tristate "Allwinner A10 Codec Support" + depends on ARCH_SUNXI || COMPILE_TEST select SND_SOC_GENERIC_DMAENGINE_PCM select REGMAP_MMIO help @@ -10,6 +11,7 @@ config SND_SUN4I_CODEC config SND_SUN4I_I2S tristate "Allwinner A10 I2S Support" + depends on ARCH_SUNXI || COMPILE_TEST select SND_SOC_GENERIC_DMAENGINE_PCM select REGMAP_MMIO help @@ -19,7 +21,7 @@ config SND_SUN4I_I2S config SND_SUN4I_SPDIF tristate "Allwinner A10 SPDIF Support" - depends on OF + depends on OF && (ARCH_SUNXI || COMPILE_TEST) select SND_SOC_GENERIC_DMAENGINE_PCM select REGMAP_MMIO help -- 2.9.3

4 5

[alsa-devel] [PATCH v2 0/4] ASoC: rsrc-card to simple-scu-card
by Kuninori Morimoto 24 Aug '16

24 Aug '16

Hi Mark Thesee are v2 of rsrc-card to simple-scu-card. rsrc-card was created for DPCM sound card for Renesas, but we can reuse this driver as more generic purpose. This driver is supporting Multi CPU and Single Codec DPCM system. Kuninori Morimoto (4): ASoC: rsrc-card: remove board specific compatible ASoC: rsrc-card: rename rsrc-card to simple-scu-card phase1 ASoC: rsrc-card: rename rsrc-card to simple-scu-card phase2 ASoC: rsrc-card: rename rsrc-card to simple-scu-card phase3 .../bindings/sound/renesas,rsrc-card.txt | 75 --------- .../devicetree/bindings/sound/simple-scu-card.txt | 80 ++++++++++ sound/soc/generic/Kconfig | 7 + sound/soc/generic/Makefile | 2 + .../rcar/rsrc-card.c => generic/simple-scu-card.c} | 172 +++++++++------------ sound/soc/sh/Kconfig | 6 - sound/soc/sh/rcar/Makefile | 3 - 7 files changed, 162 insertions(+), 183 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt create mode 100644 Documentation/devicetree/bindings/sound/simple-scu-card.txt rename sound/soc/{sh/rcar/rsrc-card.c => generic/simple-scu-card.c} (57%) -- 1.9.1

2 7

Re: [alsa-devel] good ideas
by lemeunier gilles 24 Aug '16

24 Aug '16

Hi! I have some brilliant ideas regarding the issues we've discussed last time, please read 'em here <http://ndicrugafru.whonue.net/e6wutsxl> Pardon my monkey thumbs, lemeunier gilles

1 0

[alsa-devel] [PATCH] ALSA: hda/realtek - fix headset mic detection for MSI MS-B120
by Anisse Astier 24 Aug '16

24 Aug '16

MSI Cubi MS-B120 needs the same fixup as the Gigabyte BXBT-2807 for its mic to work. They both use a single 3-way jack for both mic and headset with an ALC283 codec, with the same pins used. Cc: Daniel Drake <drake(a)endlessm.com> Signed-off-by: Anisse Astier <anisse(a)astier.eu> --- sound/pci/hda/patch_realtek.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 574b1b4..7100f05 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -4828,7 +4828,7 @@ enum { ALC293_FIXUP_DELL1_MIC_NO_PRESENCE, ALC292_FIXUP_TPT440_DOCK, ALC292_FIXUP_TPT440, - ALC283_FIXUP_BXBT2807_MIC, + ALC283_FIXUP_HEADSET_MIC, ALC255_FIXUP_DELL_WMI_MIC_MUTE_LED, ALC282_FIXUP_ASPIRE_V5_PINS, ALC280_FIXUP_HP_GPIO4, @@ -5321,7 +5321,7 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC292_FIXUP_TPT440_DOCK, }, - [ALC283_FIXUP_BXBT2807_MIC] = { + [ALC283_FIXUP_HEADSET_MIC] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) { { 0x19, 0x04a110f0 }, @@ -5651,7 +5651,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x10cf, 0x1757, "Lifebook E752", ALC269_FIXUP_LIFEBOOK_HP_PIN), SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC), SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC), - SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_BXBT2807_MIC), + SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC), + SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC), SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE), SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE), SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE), -- 2.5.5

2 1

[alsa-devel] [PATCH] ASoC: sunxi: depend on ARCH_SUNXI
by Peter Robinson 23 Aug '16

23 Aug '16

Depend on ARCH_SUNXI or COMPILE_TEST as it doesn't make sense to enable these if the appropriate SoC they're embedded in isn't enabled. Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com> --- sound/soc/sunxi/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/sunxi/Kconfig b/sound/soc/sunxi/Kconfig index 2a954bd..dd23682 100644 --- a/sound/soc/sunxi/Kconfig +++ b/sound/soc/sunxi/Kconfig @@ -1,4 +1,5 @@ menu "Allwinner SoC Audio support" + depends on ARCH_SUNXI || COMPILE_TEST config SND_SUN4I_CODEC tristate "Allwinner A10 Codec Support" -- 2.9.3

1 0

[alsa-devel] CVE-2014-9892 fix is not upstream
by Luis Henriques 23 Aug '16

23 Aug '16

Hi! Digging through some old CVEs I came across this one that doesn't seem be in mainline. Was there a good reason for not being sent upstream? Maybe it was rejected for some reason and I failed to find the discussion. References: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-9892 https://source.android.com/security/bulletin/2016-08-01.html https://source.codeaurora.org/quic/la/kernel/msm-3.10/commit/?id=591b1f455c… Cheers, -- Luís

3 3