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

[alsa-devel] [PATCH v7 0/9] ASoC: MT8173 HDMI codec support
by Philipp Zabel 27 Apr '16

27 Apr '16

Since the hdmi-codec patches are now applied [1], I have merged the hdmi-codec interface into the initial MT8173 HDMI [2] driver submission. This series now only enables the HDMI dai-links in the mt8173-rt5650-rt5676 and mt8173-rt5650 machine drivers and adds hdmi-codec ELD support and the still up in the air hdmi notifications between DRM encoder driver and hdmi-codec. Changes since v6: - Dropped "drm/mediatek: hdmi: Add audio interface to the hdmi-codec driver", patch now merged into MT8173 HDMI encoder patch. - Fixed jack detection in case HDMI is already connected at boot and the hdmi-codec driver registers the notifier block after the HDMI_CONNECTED notification is issued. [1] commit 09184118a8ab ("ASoC: hdmi-codec: Add hdmi-codec for external HDMI-encoders") of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/hdmi The mediatek drm patches apply on top of [2] https://patchwork.kernel.org/patch/8887051/ ("drm/mediatek: Add HDMI support") and need this patch: [3] https://patchwork.kernel.org/patch/8091531/ ("video: hdmi: add helper function for N and CTS") regards Philipp Koro Chen (1): ASoC: mediatek: Add HDMI dai-links in the mt8173-rt5650-rt5676 machine driver PC Liao (1): ASoC: mediatek: Add HDMI dai-links to the mt8173-rt5650 machine driver Philipp Zabel (7): ASoC: hdmi-codec: Add ELD control video: rmk's HDMI notification prototype ASoC: hdmi-codec: Use HDMI notifications to add jack support ASoC: mediatek: Add jack detection support to mt8173-rt5650-rt5676 machine driver ASoC: mediatek: Add jack detection support to the mt8173-rt5650 machine driver drm/mediatek: hdmi: issue notifications drm/mediatek: hdmi: use helper function for N and CTS calculation .../bindings/sound/mt8173-rt5650-rt5676.txt | 5 +- .../devicetree/bindings/sound/mt8173-rt5650.txt | 5 +- drivers/gpu/drm/mediatek/mtk_cec.c | 11 ++ drivers/gpu/drm/mediatek/mtk_hdmi.c | 88 ++++----------- drivers/video/Kconfig | 3 + drivers/video/Makefile | 1 + drivers/video/hdmi-notifier.c | 61 ++++++++++ include/linux/hdmi-notifier.h | 44 ++++++++ include/sound/hdmi-codec.h | 6 + sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/hdmi-codec.c | 124 +++++++++++++++++++-- sound/soc/mediatek/Kconfig | 2 + sound/soc/mediatek/mt8173-rt5650-rt5676.c | 48 ++++++++ sound/soc/mediatek/mt8173-rt5650.c | 47 ++++++++ 14 files changed, 370 insertions(+), 76 deletions(-) create mode 100644 drivers/video/hdmi-notifier.c create mode 100644 include/linux/hdmi-notifier.h -- 2.8.0.rc3

4 14

[alsa-devel] [PATCH RESEND] ASoC: arizona: Do not create OUT4R widget for CS47L24/WM1831
by Richard Fitzgerald 27 Apr '16

27 Apr '16

The CS47L24 and WM1831 codecs only use the OUT4L widget so we can skip creation of the OUT4R widget. Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/arizona.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index da61c62..0cd27e0 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -223,6 +223,8 @@ int arizona_init_spk(struct snd_soc_codec *codec) switch (arizona->type) { case WM8997: + case CS47L24: + case WM1831: break; default: ret = snd_soc_dapm_new_controls(dapm, &arizona_spkr, 1); -- 1.9.1

1 1

[alsa-devel] [PATCH 1/3] ASoC: bcm2835: add 24bit support
by kernel＠martin.sperl.org 26 Apr '16

26 Apr '16

From: Matthias Reichl <hias(a)horus.com> This adds 24 bit support to the I2S driver of the BCM2835 Code ported from bcm2708-i2s driver in Raspberry Pi tree. Signed-off-by: Florian Meier <florian.meier(a)koalo.de> Signed-off-by: Matthias Reichl <hias(a)horus.com> Signed-off-by: Martin Sperl <kernel(a)martin.sperl.org> --- sound/soc/bcm/bcm2835-i2s.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c index 1c1f221..d2663e7 100644 --- a/sound/soc/bcm/bcm2835-i2s.c +++ b/sound/soc/bcm/bcm2835-i2s.c @@ -259,6 +259,9 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream, case SNDRV_PCM_FORMAT_S16_LE: data_length = 16; break; + case SNDRV_PCM_FORMAT_S24_LE: + data_length = 24; + break; case SNDRV_PCM_FORMAT_S32_LE: data_length = 32; break; @@ -279,7 +282,7 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream, /* Setup the frame format */ format = BCM2835_I2S_CHEN; - if (data_length > 24) + if (data_length >= 24) format |= BCM2835_I2S_CHWEX; format |= BCM2835_I2S_CHWID((data_length-8)&0xf); @@ -570,6 +573,7 @@ static struct snd_soc_dai_driver bcm2835_i2s_dai = { .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_192000, .formats = SNDRV_PCM_FMTBIT_S16_LE + | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE }, .capture = { @@ -577,6 +581,7 @@ static struct snd_soc_dai_driver bcm2835_i2s_dai = { .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_192000, .formats = SNDRV_PCM_FMTBIT_S16_LE + | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE }, .ops = &bcm2835_i2s_dai_ops, -- 2.1.4

3 11

[alsa-devel] [PATCH] ASoC: omap-pcm: Initialize DMA configuration
by J.D. Schroeder 26 Apr '16

26 Apr '16

From: Jim Lodes <jim.lodes(a)garmin.com> Initialize the dma_slave_config for PCM DMA transfers, instead of leaving it uninitialized. Keeps previous data on the stack from giving us invalid values in uninitialized members of the config structure. Signed-off-by: Jim Lodes <jim.lodes(a)garmin.com> Signed-off-by: J.D. Schroeder <jay.schroeder(a)garmin.com> --- sound/soc/omap/omap-pcm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 99381a2..a84f677 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -82,6 +82,8 @@ static int omap_pcm_hw_params(struct snd_pcm_substream *substream, struct dma_chan *chan; int err = 0; + memset(&config, 0x00, sizeof(config)); + dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); /* return if this is a bufferless transfer e.g. -- 1.9.1

3 2

[alsa-devel] [PATCH] ASoC: cs42l56: Use IS_ENABLED() instead of checking for built-in or module
by Javier Martinez Canillas 26 Apr '16

26 Apr '16

The IS_ENABLED() macro checks if a Kconfig symbol has been enabled either built-in or as a module, use that macro instead of open coding the same. Signed-off-by: Javier Martinez Canillas <javier(a)osg.samsung.com> --- sound/soc/codecs/cs42l56.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c index 7cd5f769bb61..eec1ff853b98 100644 --- a/sound/soc/codecs/cs42l56.c +++ b/sound/soc/codecs/cs42l56.c @@ -56,7 +56,7 @@ struct cs42l56_private { u8 iface; u8 iface_fmt; u8 iface_inv; -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) struct input_dev *beep; struct work_struct beep_work; int beep_rate; -- 2.5.5

2 1

[alsa-devel] [PATCH] ALSA: intel_hda - Add dock support for ThinkPad X260
by Conrad Kostecki 26 Apr '16

26 Apr '16

Hi! My shiny new ThinkPad X260 is the same way affected, as older ThinkPad (X*40, X*50) generations. That means, I am unable to get sound output, when I am using the Lenovo CES 2013 docking station series (basic, pro, ultra). It can be fixed the same way, as it was already done for X240 and X250, as the X260 uses the same docking connector. I am attaching my patch, which works for me. Cheers Conrad ------------------------------ Fixes audio output on a ThinkPad X260, when using Lenovo CES 2013 docking station series (basic, pro, ultra). Signed-off-by: Conrad Kostecki <ck+linuxkernel(a)bl4ckb0x.de> diff -uprN -X linux-4.6-rc4-vanilla/Documentation/dontdiff linux-4.6-rc4-vanilla/sound/pci/hda/patch_realtek.c linux-4.6-rc4/sound/pci/hda/patch_realtek.c --- linux-4.6-rc4-vanilla/sound/pci/hda/patch_realtek.c 2016-04-24 03:26:36.330983586 +0200 +++ linux-4.6-rc4/sound/pci/hda/patch_realtek.c 2016-04-24 03:27:13.737981843 +0200 @@ -5570,6 +5570,7 @@ static const struct snd_pci_quirk alc269 SND_PCI_QUIRK(0x17aa, 0x2218, "Thinkpad X1 Carbon 2nd", ALC292_FIXUP_TPT440_DOCK), SND_PCI_QUIRK(0x17aa, 0x2223, "ThinkPad T550", ALC292_FIXUP_TPT440_DOCK), SND_PCI_QUIRK(0x17aa, 0x2226, "ThinkPad X250", ALC292_FIXUP_TPT440_DOCK), + SND_PCI_QUIRK(0x17aa, 0x504a, "ThinkPad X260", ALC292_FIXUP_TPT440_DOCK), SND_PCI_QUIRK(0x17aa, 0x2233, "Thinkpad", ALC292_FIXUP_TPT460), SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), ------------------------------ -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in

2 3

[alsa-devel] [PATCH 1/2] ASoC: rt298: reset AD dilter is there is no MCLK
by Bard Liao 26 Apr '16

26 Apr '16

rt298 need to reset AD filter and the ADC settings will take effort. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt298.c | 20 ++++++++++++++++++++ sound/soc/codecs/rt298.h | 2 ++ 2 files changed, 22 insertions(+) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index f0e6c06..178b1cc 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -481,6 +481,26 @@ static int rt298_adc_event(struct snd_soc_dapm_widget *w, snd_soc_update_bits(codec, VERB_CMD(AC_VERB_SET_AMP_GAIN_MUTE, nid, 0), 0x7080, 0x7000); + /* If MCLK doesn't exist, reset AD filter */ + if (!(snd_soc_read(codec, RT298_VAD_CTRL) & 0x200)) { + pr_info("NO MCLK\n"); + switch (nid) { + case RT298_ADC_IN1: + snd_soc_update_bits(codec, + RT298_D_FILTER_CTRL, 0x2, 0x2); + mdelay(10); + snd_soc_update_bits(codec, + RT298_D_FILTER_CTRL, 0x2, 0x0); + break; + case RT298_ADC_IN2: + snd_soc_update_bits(codec, + RT298_D_FILTER_CTRL, 0x4, 0x4); + mdelay(10); + snd_soc_update_bits(codec, + RT298_D_FILTER_CTRL, 0x4, 0x0); + break; + } + } break; case SND_SOC_DAPM_PRE_PMD: snd_soc_update_bits(codec, diff --git a/sound/soc/codecs/rt298.h b/sound/soc/codecs/rt298.h index d66f884..3638f3d 100644 --- a/sound/soc/codecs/rt298.h +++ b/sound/soc/codecs/rt298.h @@ -137,6 +137,7 @@ #define RT298_A_BIAS_CTRL2 0x02 #define RT298_POWER_CTRL1 0x03 #define RT298_A_BIAS_CTRL3 0x04 +#define RT298_D_FILTER_CTRL 0x05 #define RT298_POWER_CTRL2 0x08 #define RT298_I2S_CTRL1 0x09 #define RT298_I2S_CTRL2 0x0a @@ -148,6 +149,7 @@ #define RT298_IRQ_CTRL 0x33 #define RT298_WIND_FILTER_CTRL 0x46 #define RT298_PLL_CTRL1 0x49 +#define RT298_VAD_CTRL 0x4e #define RT298_CBJ_CTRL1 0x4f #define RT298_CBJ_CTRL2 0x50 #define RT298_PLL_CTRL 0x63 -- 1.8.1.1.439.g50a6b54

2 3

[alsa-devel] [PATCH] ASoC: mediatek: HDMI audio LR channel swapped
by PC Liao 26 Apr '16

26 Apr '16

Because LRCK of TDM use High to Low as default setting, this patch changes the TDM setting to inverse LRCK. Signed-off-by: PC Liao <pc.liao(a)mediatek.com> --- sound/soc/mediatek/mtk-afe-pcm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/mediatek/mtk-afe-pcm.c b/sound/soc/mediatek/mtk-afe-pcm.c index f1c58a2..2b5df2e 100644 --- a/sound/soc/mediatek/mtk-afe-pcm.c +++ b/sound/soc/mediatek/mtk-afe-pcm.c @@ -123,6 +123,7 @@ #define AFE_TDM_CON1_WLEN_32BIT (0x2 << 8) #define AFE_TDM_CON1_MSB_ALIGNED (0x1 << 4) #define AFE_TDM_CON1_1_BCK_DELAY (0x1 << 3) +#define AFE_TDM_CON1_LRCK_INV (0x1 << 2) #define AFE_TDM_CON1_BCK_INV (0x1 << 1) #define AFE_TDM_CON1_EN (0x1 << 0) @@ -449,6 +450,7 @@ static int mtk_afe_hdmi_prepare(struct snd_pcm_substream *substream, runtime->rate * runtime->channels * 32); val = AFE_TDM_CON1_BCK_INV | + AFE_TDM_CON1_LRCK_INV | AFE_TDM_CON1_1_BCK_DELAY | AFE_TDM_CON1_MSB_ALIGNED | /* I2S mode */ AFE_TDM_CON1_WLEN_32BIT | -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ALSA: intel_hda - Add dock support for ThinkPad T460s
by Conrad Kostecki 26 Apr '16

26 Apr '16

Hi! The new ThinkPad T460s is the same way affected, as other current ThinkPads (e.G. X260) generations. That means, you won't be able to get sound output, when using the Lenovo CES 2013 docking station series (basic, pro, ultra). It can be fixed the same way, as it was already done for X260, as the T460s uses the same docking connector. I am attaching a patch, which works for me. Cheers Conrad ------------------------------ Fixes audio output on a ThinkPad T460s, when using Lenovo CES 2013 docking station series (basic, pro, ultra). Signed-off-by: Conrad Kostecki <ck+linuxkernel(a)bl4ckb0x.de> --- linux-4.6-rc5-vanilla/sound/pci/hda/patch_realtek.c 2016-04-26 11:32:09.124832372 +0200 +++ linux-4.6-rc5/sound/pci/hda/patch_realtek.c 2016-04-26 11:32:52.123834807 +0200 @@ -5585,6 +5585,7 @@ static const struct snd_pci_quirk alc269 SND_PCI_QUIRK(0x17aa, 0x5036, "Thinkpad T450s", ALC292_FIXUP_TPT440_DOCK), SND_PCI_QUIRK(0x17aa, 0x503c, "Thinkpad L450", ALC292_FIXUP_TPT440_DOCK), SND_PCI_QUIRK(0x17aa, 0x504b, "Thinkpad", ALC293_FIXUP_LENOVO_SPK_NOISE), + SND_PCI_QUIRK(0x17aa, 0x5050, "Thinkpad T460p", ALC292_FIXUP_TPT440_DOCK), SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K), SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD), ------------------------------ -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in

1 1

[alsa-devel] [PATCH V2] ASoC: bcm2835: Register as custom PCM device to enable 16bit pcm
by kernel＠martin.sperl.org 26 Apr '16

26 Apr '16

From: Matthias Reichl <hias(a)horus.com> Register as a custom pcm device with the correct settings supporting also 16 bit. The automatic pcm discovery does not enable 16 bit modes because of a percived mismatch between the dma controller only supporting 32 bit transfers and the requirement by the HW to only support exactly 2 channels, which effectively results in a minimum size of 32 bits, which matches the dma controller transfer width. Code ported from bcm2708-i2s driver in Raspberry Pi tree. Signed-off-by: Florian Meier <florian.meier(a)koalo.de> Signed-off-by: Matthias Reichl <hias(a)horus.com> Signed-off-by: Martin Sperl <kernel(a)martin.sperl.org> Changelog: V1 -> V2: use of SZ_* defines instead of multiple of page size better description of commit message --- sound/soc/bcm/bcm2835-i2s.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c index a0026e2..66680f1 100644 --- a/sound/soc/bcm/bcm2835-i2s.c +++ b/sound/soc/bcm/bcm2835-i2s.c @@ -632,6 +632,27 @@ static const struct snd_soc_component_driver bcm2835_i2s_component = { .name = "bcm2835-i2s-comp", }; +static const struct snd_pcm_hardware bcm2835_pcm_hardware = { + .info = SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_JOINT_DUPLEX | + SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID, + .formats = SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_S24_LE | + SNDRV_PCM_FMTBIT_S32_LE, + .period_bytes_min = 32, + .period_bytes_max = SZ_256K, + .periods_min = 2, + .periods_max = 255, + .buffer_bytes_max = SZ_512K, +}; + +static const struct snd_dmaengine_pcm_config bcm2835_dmaengine_pcm_config = { + .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, + .pcm_hardware = &bcm2835_pcm_hardware, + .prealloc_buffer_size = SZ_1M, +}; + static int bcm2835_i2s_probe(struct platform_device *pdev) { struct bcm2835_i2s_dev *dev; @@ -704,7 +725,9 @@ static int bcm2835_i2s_probe(struct platform_device *pdev) return ret; } - ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); + ret = devm_snd_dmaengine_pcm_register( + &pdev->dev, &bcm2835_dmaengine_pcm_config, + SND_DMAENGINE_PCM_FLAG_COMPAT); if (ret) { dev_err(&pdev->dev, "Could not register PCM: %d\n", ret); return ret; -- 2.1.4

1 0