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

[alsa-devel] [PATCH] ASoC: amd: 16bit resolution support for i2s sp instance
by Vijendar Mukunda 09 Mar '18

09 Mar '18

Moved 16bit resolution condition check for stoney platform to acp_hw_params.Depending upon substream required register value need to be programmed rather than enabling 16bit resolution support all time in acp init. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- sound/soc/amd/acp-pcm-dma.c | 16 +++++++++------- sound/soc/amd/acp.h | 2 ++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index 9d7ab01..540088d 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -579,13 +579,6 @@ static int acp_init(void __iomem *acp_mmio, u32 asic_type) for (bank = 1; bank < 48; bank++) acp_set_sram_bank_state(acp_mmio, bank, false); } - - /* Stoney supports 16bit resolution */ - if (asic_type == CHIP_STONEY) { - val = acp_reg_read(acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN); - val |= 0x03; - acp_reg_write(val, acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN); - } return 0; } @@ -774,6 +767,7 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, { int status; uint64_t size; + u32 val = 0; struct page *pg; struct snd_pcm_runtime *runtime; struct audio_substream_data *rtd; @@ -787,6 +781,14 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, if (WARN_ON(!rtd)) return -EINVAL; + if (adata->asic_type == CHIP_STONEY) { + val = acp_reg_read(adata->acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN); + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + val |= ACP_I2S_SP_16BIT_RESOLUTION_EN; + else + val |= ACP_I2S_MIC_16BIT_RESOLUTION_EN; + acp_reg_write(val, adata->acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN); + } size = params_buffer_bytes(params); status = snd_pcm_lib_malloc_pages(substream, size); if (status < 0) diff --git a/sound/soc/amd/acp.h b/sound/soc/amd/acp.h index 27803b2..ba01510 100644 --- a/sound/soc/amd/acp.h +++ b/sound/soc/amd/acp.h @@ -70,6 +70,8 @@ #define CAPTURE_END_DMA_DESCR_CH15 7 #define mmACP_I2S_16BIT_RESOLUTION_EN 0x5209 +#define ACP_I2S_MIC_16BIT_RESOLUTION_EN 0x01 +#define ACP_I2S_SP_16BIT_RESOLUTION_EN 0x02 enum acp_dma_priority_level { /* 0x0 Specifies the DMA channel is given normal priority */ ACP_DMA_PRIORITY_LEVEL_NORMAL = 0x0, -- 2.7.4

2 1

[alsa-devel] Applied "ASoC: amd: modifications in dma stop sequence" to the asoc tree
by Mark Brown 09 Mar '18

09 Mar '18

The patch ASoC: amd: modifications in dma stop sequence has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 17aa9521d0c2856808c54ca1144d5c708e748928 Mon Sep 17 00:00:00 2001 From: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> Date: Fri, 9 Mar 2018 20:51:32 +0530 Subject: [PATCH] ASoC: amd: modifications in dma stop sequence As per design, non-circular dma also need to be stopped explicitly for both playback and capture scenarios. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/amd/acp-pcm-dma.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index 935c8fd42a7a..a1c6534455e6 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -949,12 +949,16 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd) * completes : SYSRAM_TO_ACP_CH_NUM / ACP_TO_SYSRAM_CH_NUM */ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + ret = acp_dma_stop(rtd->acp_mmio, + SYSRAM_TO_ACP_CH_NUM); ret = acp_dma_stop(rtd->acp_mmio, ACP_TO_I2S_DMA_CH_NUM); rtd->i2ssp_renderbytescount = 0; } else { ret = acp_dma_stop(rtd->acp_mmio, I2S_TO_ACP_DMA_CH_NUM); + ret = acp_dma_stop(rtd->acp_mmio, + ACP_TO_SYSRAM_CH_NUM); rtd->i2ssp_capturebytescount = 0; } break; -- 2.16.2

1 0

[alsa-devel] [PATCH] ASoC: uniphier: add support for UniPhier PXs2 AIO
by Katsuhiro Suzuki 09 Mar '18

09 Mar '18

This patch adds support for UniPhier AIO sound driver which is included in UniPhier PXs2 SoCs. Signed-off-by: Katsuhiro Suzuki <suzuki.katsuhiro(a)socionext.com> --- .../devicetree/bindings/sound/uniphier,aio.txt | 1 + sound/soc/uniphier/Kconfig | 11 + sound/soc/uniphier/Makefile | 2 + sound/soc/uniphier/aio-ld11.c | 2 +- sound/soc/uniphier/aio-pxs2.c | 320 +++++++++++++++++++++ sound/soc/uniphier/aio.h | 2 + 6 files changed, 337 insertions(+), 1 deletion(-) create mode 100644 sound/soc/uniphier/aio-pxs2.c diff --git a/Documentation/devicetree/bindings/sound/uniphier,aio.txt b/Documentation/devicetree/bindings/sound/uniphier,aio.txt index 73f6c27ae4f7..65d71cf6ef0f 100644 --- a/Documentation/devicetree/bindings/sound/uniphier,aio.txt +++ b/Documentation/devicetree/bindings/sound/uniphier,aio.txt @@ -7,6 +7,7 @@ Required properties: - compatible : should be one of the following: "socionext,uniphier-ld11-aio" "socionext,uniphier-ld20-aio" + "socionext,uniphier-pxs2-aio" - reg : offset and length of the register set for the device. - interrupts : should contain I2S or S/PDIF interrupt. - pinctrl-names : should be "default". diff --git a/sound/soc/uniphier/Kconfig b/sound/soc/uniphier/Kconfig index 5da545b9bf2a..aa3592ee1358 100644 --- a/sound/soc/uniphier/Kconfig +++ b/sound/soc/uniphier/Kconfig @@ -30,6 +30,17 @@ config SND_SOC_UNIPHIER_LD11 Select Y if you use such device. If unsure select "N". +config SND_SOC_UNIPHIER_PXS2 + tristate "UniPhier PXs2 Device Driver" + depends on SND_SOC_UNIPHIER + select SND_SOC_UNIPHIER_AIO + select SND_SOC_UNIPHIER_AIO_DMA + help + This adds ASoC driver for Socionext UniPhier PXs2 + input and output that can be used with other codecs. + Select Y if you use such device. + If unsure select "N". + config SND_SOC_UNIPHIER_EVEA_CODEC tristate "UniPhier SoC internal audio codec" depends on SND_SOC_UNIPHIER diff --git a/sound/soc/uniphier/Makefile b/sound/soc/uniphier/Makefile index 587a89700950..88169395f68a 100644 --- a/sound/soc/uniphier/Makefile +++ b/sound/soc/uniphier/Makefile @@ -1,9 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 snd-soc-uniphier-aio-cpu-objs := aio-core.o aio-dma.o aio-cpu.o aio-compress.o snd-soc-uniphier-aio-ld11-objs := aio-ld11.o +snd-soc-uniphier-aio-pxs2-objs := aio-pxs2.o obj-$(CONFIG_SND_SOC_UNIPHIER_AIO) += snd-soc-uniphier-aio-cpu.o obj-$(CONFIG_SND_SOC_UNIPHIER_LD11) += snd-soc-uniphier-aio-ld11.o +obj-$(CONFIG_SND_SOC_UNIPHIER_PXS2) += snd-soc-uniphier-aio-pxs2.o snd-soc-uniphier-evea-objs := evea.o obj-$(CONFIG_SND_SOC_UNIPHIER_EVEA_CODEC) += snd-soc-uniphier-evea.o diff --git a/sound/soc/uniphier/aio-ld11.c b/sound/soc/uniphier/aio-ld11.c index 8e40e6c2e42f..4c4dd3dd4dee 100644 --- a/sound/soc/uniphier/aio-ld11.c +++ b/sound/soc/uniphier/aio-ld11.c @@ -418,7 +418,7 @@ MODULE_DEVICE_TABLE(of, uniphier_aio_of_match); static struct platform_driver uniphier_aio_driver = { .driver = { - .name = "snd-uniphier-aio", + .name = "snd-uniphier-aio-ld11", .of_match_table = of_match_ptr(uniphier_aio_of_match), }, .probe = uniphier_aio_probe, diff --git a/sound/soc/uniphier/aio-pxs2.c b/sound/soc/uniphier/aio-pxs2.c new file mode 100644 index 000000000000..69cd5b0af948 --- /dev/null +++ b/sound/soc/uniphier/aio-pxs2.c @@ -0,0 +1,320 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Socionext UniPhier AIO ALSA driver for PXs2. +// +// Copyright (c) 2018 Socionext Inc. + +#include <linux/module.h> + +#include "aio.h" + +static const struct uniphier_aio_spec uniphier_aio_pxs2[] = { + /* for Line PCM In, Pin:AI1Dx */ + { + .name = AUD_NAME_PCMIN1, + .gname = AUD_GNAME_LINE, + .swm = { + .type = PORT_TYPE_I2S, + .dir = PORT_DIR_INPUT, + .rb = { 16, 11, }, + .ch = { 16, 11, }, + .iif = { 0, 0, }, + .iport = { 0, AUD_HW_PCMIN1, }, + }, + }, + + /* for Speaker/Headphone/Mic PCM In, Pin:AI2Dx */ + { + .name = AUD_NAME_PCMIN2, + .gname = AUD_GNAME_AUX, + .swm = { + .type = PORT_TYPE_I2S, + .dir = PORT_DIR_INPUT, + .rb = { 17, 12, }, + .ch = { 17, 12, }, + .iif = { 1, 1, }, + .iport = { 1, AUD_HW_PCMIN2, }, + }, + }, + + /* for HDMI PCM Out, Pin:AO1Dx (inner) */ + { + .name = AUD_NAME_HPCMOUT1, + .gname = AUD_GNAME_HDMI, + .swm = { + .type = PORT_TYPE_I2S, + .dir = PORT_DIR_OUTPUT, + .rb = { 0, 0, }, + .ch = { 0, 0, }, + .oif = { 0, 0, }, + .oport = { 3, AUD_HW_HPCMOUT1, }, + }, + }, + + /* for Line PCM Out, Pin:AO2Dx */ + { + .name = AUD_NAME_PCMOUT1, + .gname = AUD_GNAME_LINE, + .swm = { + .type = PORT_TYPE_I2S, + .dir = PORT_DIR_OUTPUT, + .rb = { 1, 1, }, + .ch = { 1, 1, }, + .oif = { 1, 1, }, + .oport = { 0, AUD_HW_PCMOUT1, }, + }, + }, + + /* for Speaker/Headphone/Mic PCM Out, Pin:AO3Dx */ + { + .name = AUD_NAME_PCMOUT2, + .gname = AUD_GNAME_AUX, + .swm = { + .type = PORT_TYPE_I2S, + .dir = PORT_DIR_OUTPUT, + .rb = { 2, 2, }, + .ch = { 2, 2, }, + .oif = { 2, 2, }, + .oport = { 1, AUD_HW_PCMOUT2, }, + }, + }, + + /* for HDMI Out, Pin:AO1IEC */ + { + .name = AUD_NAME_HIECOUT1, + .swm = { + .type = PORT_TYPE_SPDIF, + .dir = PORT_DIR_OUTPUT, + .rb = { 6, 4, }, + .ch = { 6, 4, }, + .oif = { 6, 4, }, + .oport = { 12, AUD_HW_HIECOUT1, }, + }, + }, + + /* for HDMI Out, Pin:AO1IEC, Compress */ + { + .name = AUD_NAME_HIECCOMPOUT1, + .swm = { + .type = PORT_TYPE_SPDIF, + .dir = PORT_DIR_OUTPUT, + .rb = { 6, 4, }, + .ch = { 6, 4, }, + .oif = { 6, 4, }, + .oport = { 12, AUD_HW_HIECOUT1, }, + }, + }, + + /* for S/PDIF Out, Pin:AO2IEC */ + { + .name = AUD_NAME_IECOUT1, + .swm = { + .type = PORT_TYPE_SPDIF, + .dir = PORT_DIR_OUTPUT, + .rb = { 7, 5, }, + .ch = { 7, 5, }, + .oif = { 7, 5, }, + .oport = { 13, AUD_HW_IECOUT1, }, + }, + }, + + /* for S/PDIF Out, Pin:AO2IEC */ + { + .name = AUD_NAME_IECCOMPOUT1, + .swm = { + .type = PORT_TYPE_SPDIF, + .dir = PORT_DIR_OUTPUT, + .rb = { 7, 5, }, + .ch = { 7, 5, }, + .oif = { 7, 5, }, + .oport = { 13, AUD_HW_IECOUT1, }, + }, + }, +}; + +static const struct uniphier_aio_pll uniphier_aio_pll_pxs2[] = { + [AUD_PLL_A1] = { .enable = true, }, + [AUD_PLL_F1] = { .enable = true, }, + [AUD_PLL_A2] = { .enable = true, }, + [AUD_PLL_F2] = { .enable = true, }, + [AUD_PLL_APLL] = { .enable = true, }, + [AUD_PLL_HSC0] = { .enable = true, }, +}; + +static int uniphier_aio_pxs2_probe(struct snd_soc_dai *dai) +{ + int ret; + + ret = uniphier_aio_dai_probe(dai); + if (ret < 0) + return ret; + + ret = snd_soc_dai_set_pll(dai, AUD_PLL_A1, 0, 0, 36864000); + if (ret < 0) + return ret; + ret = snd_soc_dai_set_pll(dai, AUD_PLL_F1, 0, 0, 36864000); + if (ret < 0) + return ret; + + ret = snd_soc_dai_set_pll(dai, AUD_PLL_A2, 0, 0, 33868800); + if (ret < 0) + return ret; + ret = snd_soc_dai_set_pll(dai, AUD_PLL_F2, 0, 0, 33868800); + if (ret < 0) + return ret; + + return 0; +} + +static struct snd_soc_dai_driver uniphier_aio_dai_pxs2[] = { + { + .name = AUD_GNAME_HDMI, + .probe = uniphier_aio_pxs2_probe, + .remove = uniphier_aio_dai_remove, + .suspend = uniphier_aio_dai_suspend, + .resume = uniphier_aio_dai_resume, + .playback = { + .stream_name = AUD_NAME_HPCMOUT1, + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .rates = SNDRV_PCM_RATE_48000, + .channels_min = 2, + .channels_max = 2, + }, + .ops = &uniphier_aio_i2s_ops, + }, + { + .name = AUD_GNAME_LINE, + .probe = uniphier_aio_pxs2_probe, + .remove = uniphier_aio_dai_remove, + .suspend = uniphier_aio_dai_suspend, + .resume = uniphier_aio_dai_resume, + .playback = { + .stream_name = AUD_NAME_PCMOUT1, + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .rates = SNDRV_PCM_RATE_48000, + .channels_min = 2, + .channels_max = 2, + }, + .capture = { + .stream_name = AUD_NAME_PCMIN1, + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .rates = SNDRV_PCM_RATE_48000, + .channels_min = 2, + .channels_max = 2, + }, + .ops = &uniphier_aio_i2s_ops, + }, + { + .name = AUD_GNAME_AUX, + .probe = uniphier_aio_pxs2_probe, + .remove = uniphier_aio_dai_remove, + .suspend = uniphier_aio_dai_suspend, + .resume = uniphier_aio_dai_resume, + .playback = { + .stream_name = AUD_NAME_PCMOUT2, + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .rates = SNDRV_PCM_RATE_48000, + .channels_min = 2, + .channels_max = 2, + }, + .capture = { + .stream_name = AUD_NAME_PCMIN2, + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .rates = SNDRV_PCM_RATE_48000, + .channels_min = 2, + .channels_max = 2, + }, + .ops = &uniphier_aio_i2s_ops, + }, + { + .name = AUD_NAME_HIECOUT1, + .probe = uniphier_aio_pxs2_probe, + .remove = uniphier_aio_dai_remove, + .suspend = uniphier_aio_dai_suspend, + .resume = uniphier_aio_dai_resume, + .playback = { + .stream_name = AUD_NAME_HIECOUT1, + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .rates = SNDRV_PCM_RATE_48000, + .channels_min = 2, + .channels_max = 2, + }, + .ops = &uniphier_aio_spdif_ops, + }, + { + .name = AUD_NAME_IECOUT1, + .probe = uniphier_aio_pxs2_probe, + .remove = uniphier_aio_dai_remove, + .suspend = uniphier_aio_dai_suspend, + .resume = uniphier_aio_dai_resume, + .playback = { + .stream_name = AUD_NAME_IECOUT1, + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .rates = SNDRV_PCM_RATE_48000, + .channels_min = 2, + .channels_max = 2, + }, + .ops = &uniphier_aio_spdif_ops, + }, + { + .name = AUD_NAME_HIECCOMPOUT1, + .probe = uniphier_aio_pxs2_probe, + .remove = uniphier_aio_dai_remove, + .suspend = uniphier_aio_dai_suspend, + .resume = uniphier_aio_dai_resume, + .compress_new = snd_soc_new_compress, + .playback = { + .stream_name = AUD_NAME_HIECCOMPOUT1, + .channels_min = 1, + .channels_max = 1, + }, + .ops = &uniphier_aio_spdif_ops, + }, + { + .name = AUD_NAME_IECCOMPOUT1, + .probe = uniphier_aio_pxs2_probe, + .remove = uniphier_aio_dai_remove, + .suspend = uniphier_aio_dai_suspend, + .resume = uniphier_aio_dai_resume, + .compress_new = snd_soc_new_compress, + .playback = { + .stream_name = AUD_NAME_IECCOMPOUT1, + .channels_min = 1, + .channels_max = 1, + }, + .ops = &uniphier_aio_spdif_ops, + }, +}; + +static const struct uniphier_aio_chip_spec uniphier_aio_pxs2_spec = { + .specs = uniphier_aio_pxs2, + .num_specs = ARRAY_SIZE(uniphier_aio_pxs2), + .dais = uniphier_aio_dai_pxs2, + .num_dais = ARRAY_SIZE(uniphier_aio_dai_pxs2), + .plls = uniphier_aio_pll_pxs2, + .num_plls = ARRAY_SIZE(uniphier_aio_pll_pxs2), + .addr_ext = 0, +}; + +static const struct of_device_id uniphier_aio_of_match[] = { + { + .compatible = "socionext,uniphier-pxs2-aio", + .data = &uniphier_aio_pxs2_spec, + }, + {}, +}; +MODULE_DEVICE_TABLE(of, uniphier_aio_of_match); + +static struct platform_driver uniphier_aio_driver = { + .driver = { + .name = "snd-uniphier-aio-pxs2", + .of_match_table = of_match_ptr(uniphier_aio_of_match), + }, + .probe = uniphier_aio_probe, + .remove = uniphier_aio_remove, +}; +module_platform_driver(uniphier_aio_driver); + +MODULE_AUTHOR("Katsuhiro Suzuki <suzuki.katsuhiro(a)socionext.com>"); +MODULE_DESCRIPTION("UniPhier PXs2 AIO driver."); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/uniphier/aio.h b/sound/soc/uniphier/aio.h index 2cd64273fb5b..793334675cb3 100644 --- a/sound/soc/uniphier/aio.h +++ b/sound/soc/uniphier/aio.h @@ -110,9 +110,11 @@ enum IEC61937_PC { #define AUD_NAME_IECOUT1 "aio-iecout1" #define AUD_NAME_CMASTER "aio-cmaster" #define AUD_NAME_HIECCOMPOUT1 "aio-hieccompout1" +#define AUD_NAME_IECCOMPOUT1 "aio-ieccompout1" #define AUD_GNAME_HDMI "aio-hdmi" #define AUD_GNAME_LINE "aio-line" +#define AUD_GNAME_AUX "aio-aux" #define AUD_GNAME_IEC "aio-iec" #define AUD_CLK_IO 0 -- 2.16.1

2 1

[alsa-devel] [PATCH] ASoC: da7219: Add common clock usage for providing DAI clks
by Adam Thomson 09 Mar '18

09 Mar '18

There is a need to use DA7219 as DAI clock master for other codecs within a system, which means that the DAI clocks are required to remain, regardless of whether the codec is actually running playback/capture. To be able to expose control of the DAI clocking the common clock framework has been employed. The current implementation adds a simple clock gate for enabling and disabling the DAI clocks, with no rate control supported (this is still handled through standard hw_params() functions as before). If DT is enabled then the clock is added to the OF providers list, otherwise a clkdev lookup is used. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource(a)diasemi.com> --- Documentation/devicetree/bindings/sound/da7219.txt | 6 + include/sound/da7219.h | 2 + sound/soc/codecs/da7219.c | 129 +++++++++++++++++++-- sound/soc/codecs/da7219.h | 9 ++ 4 files changed, 138 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/da7219.txt b/Documentation/devicetree/bindings/sound/da7219.txt index 5b54d2d..c3df92d 100644 --- a/Documentation/devicetree/bindings/sound/da7219.txt +++ b/Documentation/devicetree/bindings/sound/da7219.txt @@ -25,6 +25,9 @@ Optional properties: interrupt is to be used to wake system, otherwise "irq" should be used. - wakeup-source: Flag to indicate this device can wake system (suspend/resume). +- #clock-cells : Should be set to '<0>', only one clock source provided; +- clock-output-names : Name given for DAI clocks output; + - clocks : phandle and clock specifier for codec MCLK. - clock-names : Clock name string for 'clocks' attribute, should be "mclk". @@ -83,6 +86,9 @@ Example: VDDMIC-supply = <&reg_audio>; VDDIO-supply = <&reg_audio>; + #clock-cells = <0>; + clock-output-names = "dai-clks"; + clocks = <&clks 201>; clock-names = "mclk"; diff --git a/include/sound/da7219.h b/include/sound/da7219.h index 409ef139..1bfcb16 100644 --- a/include/sound/da7219.h +++ b/include/sound/da7219.h @@ -36,6 +36,8 @@ enum da7219_mic_amp_in_sel { struct da7219_pdata { bool wakeup_source; + const char *dai_clks_name; + /* Mic */ enum da7219_micbias_voltage micbias_lvl; enum da7219_mic_amp_in_sel mic_amp_in_sel; diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index 5e043d0..4412159 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -13,6 +13,8 @@ #include <linux/acpi.h> #include <linux/clk.h> +#include <linux/clkdev.h> +#include <linux/clk-provider.h> #include <linux/i2c.h> #include <linux/of_device.h> #include <linux/property.h> @@ -772,16 +774,27 @@ static int da7219_dai_event(struct snd_soc_dapm_widget *w, struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component); u8 pll_ctrl, pll_status; - int i = 0; + int i = 0, ret; bool srm_lock = false; switch (event) { case SND_SOC_DAPM_PRE_PMU: - if (da7219->master) + if (da7219->master) { /* Enable DAI clks for master mode */ - snd_soc_component_update_bits(component, DA7219_DAI_CLK_MODE, - DA7219_DAI_CLK_EN_MASK, - DA7219_DAI_CLK_EN_MASK); + if (da7219->dai_clks) { + ret = clk_prepare_enable(da7219->dai_clks); + if (ret) { + dev_err(component->dev, + "Failed to enable dai_clks\n"); + return ret; + } + } else { + snd_soc_component_update_bits(component, + DA7219_DAI_CLK_MODE, + DA7219_DAI_CLK_EN_MASK, + DA7219_DAI_CLK_EN_MASK); + } + } /* PC synchronised to DAI */ snd_soc_component_update_bits(component, DA7219_PC_COUNT, @@ -814,9 +827,16 @@ static int da7219_dai_event(struct snd_soc_dapm_widget *w, DA7219_PC_FREERUN_MASK); /* Disable DAI clks if in master mode */ - if (da7219->master) - snd_soc_component_update_bits(component, DA7219_DAI_CLK_MODE, - DA7219_DAI_CLK_EN_MASK, 0); + if (da7219->master) { + if (da7219->dai_clks) + clk_disable_unprepare(da7219->dai_clks); + else + snd_soc_component_update_bits(component, + DA7219_DAI_CLK_MODE, + DA7219_DAI_CLK_EN_MASK, + 0); + } + return 0; default: return -EINVAL; @@ -1598,6 +1618,12 @@ static struct da7219_pdata *da7219_fw_to_pdata(struct snd_soc_component *compone pdata->wakeup_source = device_property_read_bool(dev, "wakeup-source"); + pdata->dai_clks_name = "da7219-dai-clks"; + if (device_property_read_string(dev, "clock-output-names", + &pdata->dai_clks_name)) + dev_warn(dev, "Using default clk name: %s\n", + pdata->dai_clks_name); + if (device_property_read_u32(dev, "dlg,micbias-lvl", &of_val32) >= 0) pdata->micbias_lvl = da7219_fw_micbias_lvl(dev, of_val32); else @@ -1712,6 +1738,88 @@ static int da7219_handle_supplies(struct snd_soc_component *component) return 0; } +#ifdef CONFIG_COMMON_CLK +static int da7219_dai_clks_prepare(struct clk_hw *hw) +{ + struct da7219_priv *da7219 = + container_of(hw, struct da7219_priv, dai_clks_hw); + struct snd_soc_component *component = da7219->aad->component; + + snd_soc_component_update_bits(component, DA7219_DAI_CLK_MODE, + DA7219_DAI_CLK_EN_MASK, + DA7219_DAI_CLK_EN_MASK); + + return 0; +} + +static void da7219_dai_clks_unprepare(struct clk_hw *hw) +{ + struct da7219_priv *da7219 = + container_of(hw, struct da7219_priv, dai_clks_hw); + struct snd_soc_component *component = da7219->aad->component; + + snd_soc_component_update_bits(component, DA7219_DAI_CLK_MODE, + DA7219_DAI_CLK_EN_MASK, 0); +} + +static int da7219_dai_clks_is_prepared(struct clk_hw *hw) +{ + struct da7219_priv *da7219 = + container_of(hw, struct da7219_priv, dai_clks_hw); + struct snd_soc_component *component = da7219->aad->component; + u8 clk_reg; + + clk_reg = snd_soc_component_read32(component, DA7219_DAI_CLK_MODE); + + return !!(clk_reg & DA7219_DAI_CLK_EN_MASK); +} + +const struct clk_ops da7219_dai_clks_ops = { + .prepare = da7219_dai_clks_prepare, + .unprepare = da7219_dai_clks_unprepare, + .is_prepared = da7219_dai_clks_is_prepared, +}; + +static void da7219_register_dai_clks(struct snd_soc_component *component) +{ + struct device *dev = component->dev; + struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component); + struct da7219_pdata *pdata = da7219->pdata; + struct clk_init_data init = {}; + struct clk *dai_clks; + struct clk_lookup *dai_clks_lookup; + + init.parent_names = NULL; + init.num_parents = 0; + init.name = pdata->dai_clks_name; + init.ops = &da7219_dai_clks_ops; + da7219->dai_clks_hw.init = &init; + + dai_clks = devm_clk_register(dev, &da7219->dai_clks_hw); + if (IS_ERR(dai_clks)) { + dev_warn(dev, "Failed to register DAI clocks: %ld\n", + PTR_ERR(dai_clks)); + return; + } + da7219->dai_clks = dai_clks; + + /* If we're using DT, then register as provider accordingly */ + if (dev->of_node) { + devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, + &da7219->dai_clks_hw); + } else { + dai_clks_lookup = clkdev_create(dai_clks, pdata->dai_clks_name, + "%s", dev_name(dev)); + if (!dai_clks_lookup) + dev_warn(dev, "Failed to create DAI clkdev"); + else + da7219->dai_clks_lookup = dai_clks_lookup; + } +} +#else +static inline void da7219_register_dai_clks(struct snd_soc_component *component) {} +#endif /* CONFIG_COMMON_CLK */ + static void da7219_handle_pdata(struct snd_soc_component *component) { struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component); @@ -1722,6 +1830,8 @@ static void da7219_handle_pdata(struct snd_soc_component *component) da7219->wakeup_source = pdata->wakeup_source; + da7219_register_dai_clks(component); + /* Mic Bias voltages */ switch (pdata->micbias_lvl) { case DA7219_MICBIAS_1_6V: @@ -1856,6 +1966,9 @@ static void da7219_remove(struct snd_soc_component *component) da7219_aad_exit(component); + if (da7219->dai_clks_lookup) + clkdev_drop(da7219->dai_clks_lookup); + /* Supplies */ regulator_bulk_disable(DA7219_NUM_SUPPLIES, da7219->supplies); } diff --git a/sound/soc/codecs/da7219.h b/sound/soc/codecs/da7219.h index 1acb34c..1b00023 100644 --- a/sound/soc/codecs/da7219.h +++ b/sound/soc/codecs/da7219.h @@ -14,6 +14,9 @@ #ifndef __DA7219_H #define __DA7219_H +#include <linux/clk.h> +#include <linux/clkdev.h> +#include <linux/clk-provider.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h> #include <sound/da7219.h> @@ -813,6 +816,12 @@ struct da7219_priv { struct mutex ctrl_lock; struct mutex pll_lock; +#ifdef CONFIG_COMMON_CLK + struct clk_hw dai_clks_hw; +#endif + struct clk_lookup *dai_clks_lookup; + struct clk *dai_clks; + struct clk *mclk; unsigned int mclk_rate; int clk_src; -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: amd: modifications in dma stop sequence
by Vijendar Mukunda 09 Mar '18

09 Mar '18

As per design, non-circular dma also need to be stopped explicitly for both playback and capture scenarios. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- sound/soc/amd/acp-pcm-dma.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index 91c4775..9d7ab01 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -954,11 +954,15 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd) */ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { ret = acp_dma_stop(rtd->acp_mmio, + SYSRAM_TO_ACP_CH_NUM); + ret = acp_dma_stop(rtd->acp_mmio, ACP_TO_I2S_DMA_CH_NUM); rtd->i2ssp_renderbytescount = 0; } else { ret = acp_dma_stop(rtd->acp_mmio, I2S_TO_ACP_DMA_CH_NUM); + ret = acp_dma_stop(rtd->acp_mmio, + ACP_TO_SYSRAM_CH_NUM); rtd->i2ssp_capturebytescount = 0; } break; -- 2.7.4

1 0

[alsa-devel] Cirrus CS4207 not working on 4.14.24
by Jorge Fernandez Monteagudo 09 Mar '18

09 Mar '18

Hi all! I've updated my system from a 3.16.7 kernel to a 4.14.24 kernel and sound stops working. I have a Cirrus logic CS4207 codec. I've tracked down the problem using the '/proc/asound/card0/codec\#0' info. With the 3.16.7 kernel all nodes power states are: Node 0x03: Power: setting=D0, actual=D0 Node 0x0a: Power: setting=D0, actual=D0 and with 4.14.24 they are on Node 0x03: Power: setting=D0, actual=D3 Node 0x0a: Power: setting=D3, actual=D3 Once in this situation I'm able to go to D0 again and make the sound works. I've used hda-verb 0.4 to SET_POWER_STATE to 0 with no luck. Finally, I've patched the 4.14.24 to avoid changing to D3 and now the sound is working again. I know it's not the way to go but I need the sound... --- a/linux-4.14.24/sound/hda/hdac_device.c 2018-03-08 14:12:44.263575493 +0100 +++ b/linux-4.14.24/sound/hda/hdac_device.c 2018-03-08 14:12:44.263575493 +0100 @@ -1061,6 +1061,9 @@ int snd_hdac_codec_write(struct hdac_device *hdac, hda_nid_t nid, int flags, unsigned int verb, unsigned int parm) { + /* Ugly patch to avoid going to low power state!! */ + if (verb == 0x705 && parm == 0x3) + return 0; return codec_write(hdac, nid, flags, verb, parm); } EXPORT_SYMBOL_GPL(snd_hdac_codec_write); I've patched both kernels to show all the codec writes to show all the sequence in both kernels. Maybe it can help to fix the problem in the correct way. kernel 3.16.7 [ 28.685789] snd_hda_intel: probe of 0000:00:01.1 failed with error -2 [ 28.697622] -- snd_hda_codec_write: nid 0x2, verb:0x705, parm:0x0 [ 28.697681] -- snd_hda_codec_write: nid 0x3, verb:0x705, parm:0x0 [ 28.697726] -- snd_hda_codec_write: nid 0x4, verb:0x705, parm:0x0 [ 28.697762] -- snd_hda_codec_write: nid 0x5, verb:0x705, parm:0x0 [ 28.697807] -- snd_hda_codec_write: nid 0x6, verb:0x705, parm:0x0 [ 28.697851] -- snd_hda_codec_write: nid 0x7, verb:0x705, parm:0x0 [ 28.697887] -- snd_hda_codec_write: nid 0x8, verb:0x705, parm:0x0 [ 28.697932] -- snd_hda_codec_write: nid 0x9, verb:0x705, parm:0x0 [ 28.697977] -- snd_hda_codec_write: nid 0xA, verb:0x705, parm:0x0 [ 28.698013] -- snd_hda_codec_write: nid 0xC, verb:0x705, parm:0x0 [ 28.698058] -- snd_hda_codec_write: nid 0xD, verb:0x705, parm:0x0 [ 28.698102] -- snd_hda_codec_write: nid 0xF, verb:0x705, parm:0x0 [ 28.698138] -- snd_hda_codec_write: nid 0x14, verb:0x705, parm:0x0 [ 28.698669] sound hdaudioC0D0: autoconfig: line_outs=1 (0xa/0x0/0x0/0x0/0x0) type:line [ 28.698673] sound hdaudioC0D0: speaker_outs=1 (0xb/0x0/0x0/0x0/0x0) [ 28.698676] sound hdaudioC0D0: hp_outs=1 (0x9/0x0/0x0/0x0/0x0) [ 28.698678] sound hdaudioC0D0: mono: mono_out=0x0 [ 28.698681] sound hdaudioC0D0: dig-out=0x10/0x15 [ 28.698683] sound hdaudioC0D0: inputs: [ 28.698687] sound hdaudioC0D0: Mic=0xd [ 28.698689] sound hdaudioC0D0: Line=0xc [ 28.698691] sound hdaudioC0D0: dig-in=0x12 [ 28.699332] -- snd_hda_codec_write: nid 0x9, verb:0x708, parm:0x81 [ 28.699370] -- snd_hda_codec_write: nid 0xA, verb:0x708, parm:0x82 [ 28.700249] -- snd_hda_codec_write: nid 0x1, verb:0x705, parm:0x0 [ 28.700285] -- snd_hda_codec_write: nid 0x11, verb:0x703, parm:0x1 [ 28.700330] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x8 [ 28.700376] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x9999 [ 28.700411] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x17 [ 28.700456] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0xA412 [ 28.700501] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x1 [ 28.700537] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x9 [ 28.700582] -- snd_hda_codec_write: nid 0x7, verb:0x705, parm:0x0 [ 28.700626] -- snd_hda_codec_write: nid 0x8, verb:0x705, parm:0x0 [ 28.700662] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x17 [ 28.700706] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x2412 [ 28.700751] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x8 [ 28.700785] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x0 [ 28.700830] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x1 [ 28.700874] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x8 [ 28.700911] -- snd_hda_codec_write: nid 0x11, verb:0x703, parm:0x0 [ 28.700956] -- snd_hda_codec_write: nid 0x11, verb:0x703, parm:0x1 [ 28.701001] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x3 [ 28.701038] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x146A [ 28.701083] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x2 [ 28.701124] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0xA [ 28.701169] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x4 [ 28.701226] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x7 [ 28.702188] -- snd_hda_codec_write: nid 0x3, verb:0x300, parm:0xA080 [ 28.702235] -- snd_hda_codec_write: nid 0x3, verb:0x300, parm:0x9080 [ 28.702295] -- snd_hda_codec_write: nid 0x2, verb:0x300, parm:0xA080 [ 28.702330] -- snd_hda_codec_write: nid 0x2, verb:0x300, parm:0x9080 [ 28.702379] -- snd_hda_codec_write: nid 0x4, verb:0x300, parm:0xA080 [ 28.702414] -- snd_hda_codec_write: nid 0x4, verb:0x300, parm:0x9080 [ 28.702459] -- snd_hda_codec_write: nid 0x6, verb:0x300, parm:0x6080 [ 28.702497] -- snd_hda_codec_write: nid 0x6, verb:0x300, parm:0x5080 [ 28.702542] -- snd_hda_codec_write: nid 0x5, verb:0x300, parm:0x6080 [ 28.702586] -- snd_hda_codec_write: nid 0x5, verb:0x300, parm:0x5080 [ 28.702621] -- snd_hda_codec_write: nid 0x6, verb:0x300, parm:0x6180 [ 28.702666] -- snd_hda_codec_write: nid 0x6, verb:0x300, parm:0x5180 [ 28.702710] -- snd_hda_codec_write: nid 0x5, verb:0x300, parm:0x6180 [ 28.702745] -- snd_hda_codec_write: nid 0x5, verb:0x300, parm:0x5180 [ 28.702791] -- snd_hda_codec_write: nid 0xA, verb:0x707, parm:0x40 [ 28.702836] -- snd_hda_codec_write: nid 0x9, verb:0x707, parm:0xC0 [ 28.702872] -- snd_hda_codec_write: nid 0xB, verb:0x707, parm:0x40 [ 28.702917] -- snd_hda_codec_write: nid 0xD, verb:0x707, parm:0x24 [ 28.702962] -- snd_hda_codec_write: nid 0xC, verb:0x707, parm:0x20 [ 28.702998] -- snd_hda_codec_write: nid 0x6, verb:0x701, parm:0x0 [ 28.703044] -- snd_hda_codec_write: nid 0x10, verb:0x707, parm:0x40 [ 28.703081] -- snd_hda_codec_write: nid 0x15, verb:0x707, parm:0x40 [ 28.703130] -- snd_hda_codec_write: nid 0x12, verb:0x707, parm:0x0 [ 28.703185] -- snd_hda_codec_write: nid 0xC, verb:0x708, parm:0x0 [ 28.703230] -- snd_hda_codec_write: nid 0xD, verb:0x708, parm:0x0 [ 28.703275] -- snd_hda_codec_write: nid 0xF, verb:0x708, parm:0x0 [ 28.703311] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x4 [ 28.703398] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x4 [ 28.703434] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x1F [ 28.703479] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x1 [ 28.703517] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x400A [ 28.704045] -- snd_hda_codec_write: nid 0xD, verb:0x708, parm:0x83 [ 28.704148] -- snd_hda_codec_write: nid 0xC, verb:0x708, parm:0x84 [ 28.917726] -- snd_hda_codec_write: nid 0xB, verb:0x707, parm:0x0 [ 28.917797] -- snd_hda_codec_write: nid 0xA, verb:0x707, parm:0x0 [ 29.746841] -- snd_hda_codec_write: nid 0x3, verb:0x300, parm:0xA000 [ 29.746893] -- snd_hda_codec_write: nid 0x3, verb:0x300, parm:0x9000 [ 29.746940] -- snd_hda_codec_write: nid 0x2, verb:0x300, parm:0xA000 [ 29.746991] -- snd_hda_codec_write: nid 0x2, verb:0x300, parm:0x9000 [ 29.747037] -- snd_hda_codec_write: nid 0x4, verb:0x300, parm:0xA000 [ 29.747074] -- snd_hda_codec_write: nid 0x4, verb:0x300, parm:0x9000 [ 29.761263] -- snd_hda_codec_write: nid 0x8, verb:0x70D, parm:0x1 [ 29.761322] -- snd_hda_codec_write: nid 0x14, verb:0x70D, parm:0x1 [ 29.773546] -- snd_hda_codec_write: nid 0x3, verb:0x300, parm:0xA073 [ 29.773601] -- snd_hda_codec_write: nid 0x3, verb:0x300, parm:0x9073 [ 29.773648] -- snd_hda_codec_write: nid 0x2, verb:0x300, parm:0xA073 [ 29.773693] -- snd_hda_codec_write: nid 0x2, verb:0x300, parm:0x9073 [ 29.773749] -- snd_hda_codec_write: nid 0x4, verb:0x300, parm:0xA073 [ 29.773793] -- snd_hda_codec_write: nid 0x4, verb:0x300, parm:0x9073 [ 29.779742] -- snd_hda_codec_write: nid 0x3, verb:0x300, parm:0xA062 [ 29.779829] -- snd_hda_codec_write: nid 0x3, verb:0x300, parm:0x9062 [ 29.794831] -- snd_hda_codec_write: nid 0x8, verb:0x706, parm:0x50 [ 29.796917] -- snd_hda_codec_write: nid 0x8, verb:0x200, parm:0x31 [ 29.797021] -- snd_hda_codec_write: nid 0x14, verb:0x706, parm:0x50 [ 29.798923] -- snd_hda_codec_write: nid 0x14, verb:0x200, parm:0x31 [ 29.799030] -- snd_hda_codec_write: nid 0x3, verb:0x706, parm:0x50 [ 29.800919] -- snd_hda_codec_write: nid 0x3, verb:0x200, parm:0x31 [ 29.801005] -- snd_hda_codec_write: nid 0x2, verb:0x706, parm:0x50 [ 29.802960] -- snd_hda_codec_write: nid 0x2, verb:0x200, parm:0x31 [ 29.803053] -- snd_hda_codec_write: nid 0x4, verb:0x706, parm:0x50 [ 29.804932] -- snd_hda_codec_write: nid 0x4, verb:0x200, parm:0x31 [ 33.323243] systemd-udevd[1441]: starting version 215 kernel 4.14.24 [ 33.942455] snd_hda_intel: probe of 0000:00:01.1 failed with error -2 [ 33.949069] -- snd_hda_codec_write: nid 0x2, verb:0x705, parm:0x0 [ 33.949105] -- snd_hda_codec_write: nid 0x3, verb:0x705, parm:0x0 [ 33.949149] -- snd_hda_codec_write: nid 0x4, verb:0x705, parm:0x0 [ 33.949196] -- snd_hda_codec_write: nid 0x5, verb:0x705, parm:0x0 [ 33.949231] -- snd_hda_codec_write: nid 0x6, verb:0x705, parm:0x0 [ 33.949275] -- snd_hda_codec_write: nid 0x7, verb:0x705, parm:0x0 [ 33.949318] -- snd_hda_codec_write: nid 0x8, verb:0x705, parm:0x0 [ 33.949363] -- snd_hda_codec_write: nid 0x9, verb:0x705, parm:0x0 [ 33.949397] -- snd_hda_codec_write: nid 0xA, verb:0x705, parm:0x0 [ 33.949441] -- snd_hda_codec_write: nid 0xC, verb:0x705, parm:0x0 [ 33.949484] -- snd_hda_codec_write: nid 0xD, verb:0x705, parm:0x0 [ 33.949522] -- snd_hda_codec_write: nid 0xF, verb:0x705, parm:0x0 [ 33.949566] -- snd_hda_codec_write: nid 0x14, verb:0x705, parm:0x0 [ 33.950243] snd_hda_codec_cirrus hdaudioC0D0: autoconfig for CS4207: line_outs=1 (0xa/0x0/0x0/0x0/0x0) type:line [ 33.950245] snd_hda_codec_cirrus hdaudioC0D0: speaker_outs=1 (0xb/0x0/0x0/0x0/0x0) [ 33.950251] snd_hda_codec_cirrus hdaudioC0D0: hp_outs=1 (0x9/0x0/0x0/0x0/0x0) [ 33.950252] snd_hda_codec_cirrus hdaudioC0D0: mono: mono_out=0x0 [ 33.950253] snd_hda_codec_cirrus hdaudioC0D0: dig-out=0x10/0x15 [ 33.950254] snd_hda_codec_cirrus hdaudioC0D0: inputs: [ 33.950256] snd_hda_codec_cirrus hdaudioC0D0: Mic=0xd [ 33.950257] snd_hda_codec_cirrus hdaudioC0D0: Line=0xc [ 33.950258] snd_hda_codec_cirrus hdaudioC0D0: dig-in=0x12 [ 33.951210] -- snd_hda_codec_write: nid 0x4, verb:0x705, parm:0x3 [ 33.952301] -- snd_hda_codec_write: nid 0x1, verb:0x705, parm:0x0 [ 33.952336] -- snd_hda_codec_write: nid 0x11, verb:0x703, parm:0x1 [ 33.952381] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x8 [ 33.952420] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x9999 [ 33.952464] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x17 [ 33.952502] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0xA412 [ 33.952547] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x1 [ 33.952586] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x9 [ 33.952629] -- snd_hda_codec_write: nid 0x7, verb:0x705, parm:0x0 [ 33.952669] -- snd_hda_codec_write: nid 0x8, verb:0x705, parm:0x0 [ 33.952713] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x17 [ 33.952752] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x2412 [ 33.952796] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x8 [ 33.952835] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x0 [ 33.952879] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x1 [ 33.952918] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x8 [ 33.952962] -- snd_hda_codec_write: nid 0x11, verb:0x703, parm:0x0 [ 33.953006] -- snd_hda_codec_write: nid 0x11, verb:0x703, parm:0x1 [ 33.953045] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x3 [ 33.953087] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x146A [ 33.953132] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x2 [ 33.953178] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0xA [ 33.953234] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x4 [ 33.953273] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x7 [ 33.953421] -- snd_hda_codec_write: nid 0x3, verb:0x705, parm:0x3 [ 33.953504] -- snd_hda_codec_write: nid 0xA, verb:0x705, parm:0x3 [ 33.953796] -- snd_hda_codec_write: nid 0x2, verb:0x705, parm:0x3 [ 33.953879] -- snd_hda_codec_write: nid 0x9, verb:0x705, parm:0x3 [ 33.954468] -- snd_hda_codec_write: nid 0xD, verb:0x705, parm:0x3 [ 33.955253] -- snd_hda_codec_write: nid 0x8, verb:0x705, parm:0x3 [ 33.955378] -- snd_hda_codec_write: nid 0x14, verb:0x705, parm:0x3 [ 33.955924] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x4 [ 33.956026] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x4 [ 33.956065] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x1F [ 33.956109] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x1 [ 33.956149] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x400A [ 33.956587] -- snd_hda_codec_write: nid 0x7, verb:0x705, parm:0x3 [ 33.956796] -- snd_hda_codec_write: nid 0xC, verb:0x705, parm:0x3 [ 33.956919] -- snd_hda_codec_write: nid 0xF, verb:0x705, parm:0x3 [ 33.957382] input: HD-Audio Generic Mic as /devices/pci0000:00/0000:00:09.2/sound/card0/input5 [ 33.957430] input: HD-Audio Generic Line as /devices/pci0000:00/0000:00:09.2/sound/card0/input6 [ 33.957476] input: HD-Audio Generic Line Out as /devices/pci0000:00/0000:00:09.2/sound/card0/input7 [ 33.957518] input: HD-Audio Generic Front Headphone as /devices/pci0000:00/0000:00:09.2/sound/card0/input8 [ 33.970031] -- snd_hda_codec_write: nid 0x2, verb:0x705, parm:0x3 [ 33.970091] -- snd_hda_codec_write: nid 0x3, verb:0x705, parm:0x3 [ 33.970127] -- snd_hda_codec_write: nid 0x4, verb:0x705, parm:0x3 [ 33.970170] -- snd_hda_codec_write: nid 0x5, verb:0x705, parm:0x3 [ 33.970214] -- snd_hda_codec_write: nid 0x6, verb:0x705, parm:0x3 [ 33.970253] -- snd_hda_codec_write: nid 0x7, verb:0x705, parm:0x3 [ 33.970297] -- snd_hda_codec_write: nid 0x8, verb:0x705, parm:0x3 [ 33.970336] -- snd_hda_codec_write: nid 0x9, verb:0x705, parm:0x3 [ 33.970380] -- snd_hda_codec_write: nid 0xA, verb:0x705, parm:0x3 [ 33.970420] -- snd_hda_codec_write: nid 0xC, verb:0x705, parm:0x3 [ 33.970463] -- snd_hda_codec_write: nid 0xD, verb:0x705, parm:0x3 [ 33.970502] -- snd_hda_codec_write: nid 0xF, verb:0x705, parm:0x3 [ 33.970546] -- snd_hda_codec_write: nid 0x14, verb:0x705, parm:0x3 [ 33.970693] -- snd_hda_codec_write: nid 0x2, verb:0x705, parm:0x3 [ 33.970732] -- snd_hda_codec_write: nid 0x3, verb:0x705, parm:0x3 [ 33.970775] -- snd_hda_codec_write: nid 0x4, verb:0x705, parm:0x3 [ 33.970815] -- snd_hda_codec_write: nid 0x5, verb:0x705, parm:0x0 [ 33.970858] -- snd_hda_codec_write: nid 0x6, verb:0x705, parm:0x0 [ 33.970903] -- snd_hda_codec_write: nid 0x7, verb:0x705, parm:0x3 [ 33.970942] -- snd_hda_codec_write: nid 0x8, verb:0x705, parm:0x3 [ 33.970987] -- snd_hda_codec_write: nid 0x9, verb:0x705, parm:0x3 [ 33.971025] -- snd_hda_codec_write: nid 0xA, verb:0x705, parm:0x3 [ 33.971065] -- snd_hda_codec_write: nid 0xC, verb:0x705, parm:0x3 [ 33.971109] -- snd_hda_codec_write: nid 0xD, verb:0x705, parm:0x3 [ 33.971153] -- snd_hda_codec_write: nid 0xF, verb:0x705, parm:0x3 [ 33.971191] -- snd_hda_codec_write: nid 0x14, verb:0x705, parm:0x3 [ 33.971276] -- snd_hda_codec_write: nid 0x1, verb:0x705, parm:0x0 [ 33.971314] -- snd_hda_codec_write: nid 0x11, verb:0x703, parm:0x1 [ 33.971358] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x8 [ 33.971402] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x9999 [ 33.971441] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x17 [ 33.971485] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0xA412 [ 33.971524] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x1 [ 33.971569] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x9 [ 33.971608] -- snd_hda_codec_write: nid 0x7, verb:0x705, parm:0x0 [ 33.971652] -- snd_hda_codec_write: nid 0x8, verb:0x705, parm:0x0 [ 33.971691] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x17 [ 33.971735] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x2412 [ 33.971781] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x8 [ 33.971815] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x0 [ 33.971864] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x1 [ 33.971898] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x8 [ 33.971942] -- snd_hda_codec_write: nid 0x11, verb:0x703, parm:0x0 [ 33.971987] -- snd_hda_codec_write: nid 0x11, verb:0x703, parm:0x1 [ 33.972023] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x3 [ 33.972068] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x146A [ 33.972107] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x2 [ 33.972151] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0xA [ 33.972189] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x4 [ 33.972234] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x7 [ 33.972815] -- snd_hda_codec_write: nid 0x6, verb:0x705, parm:0x0 [ 33.973004] -- snd_hda_codec_write: nid 0x8, verb:0x705, parm:0x3 [ 33.974881] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x4 [ 33.974962] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x4 [ 33.975002] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x1F [ 33.975046] -- snd_hda_codec_write: nid 0x11, verb:0x500, parm:0x1 [ 33.975086] -- snd_hda_codec_write: nid 0x11, verb:0x400, parm:0x400A [ 35.029721] -- snd_hda_codec_write: nid 0x8, verb:0x705, parm:0x0 [ 35.029816] -- snd_hda_codec_write: nid 0x8, verb:0x706, parm:0x50 [ 35.032018] -- snd_hda_codec_write: nid 0x8, verb:0x200, parm:0x31 [ 35.032108] -- snd_hda_codec_write: nid 0x14, verb:0x705, parm:0x0 [ 35.032192] -- snd_hda_codec_write: nid 0x14, verb:0x706, parm:0x50 [ 35.036014] -- snd_hda_codec_write: nid 0x14, verb:0x200, parm:0x31 [ 35.036130] -- snd_hda_codec_write: nid 0x3, verb:0x705, parm:0x0 [ 35.036253] -- snd_hda_codec_write: nid 0x3, verb:0x706, parm:0x50 [ 35.039063] -- snd_hda_codec_write: nid 0x3, verb:0x200, parm:0x31 [ 35.039155] -- snd_hda_codec_write: nid 0x2, verb:0x705, parm:0x0 [ 35.039275] -- snd_hda_codec_write: nid 0x2, verb:0x706, parm:0x50 [ 35.042023] -- snd_hda_codec_write: nid 0x2, verb:0x200, parm:0x31 [ 35.042109] -- snd_hda_codec_write: nid 0x4, verb:0x705, parm:0x0 [ 35.042192] -- snd_hda_codec_write: nid 0x4, verb:0x706, parm:0x50 [ 35.045006] -- snd_hda_codec_write: nid 0x4, verb:0x200, parm:0x31 [ 38.553348] systemd-udevd[1465]: starting version 215

2 8

Re: [alsa-devel] [PATCH] dt-bindings: exynos: Document #sound-dai-cells property of the HDMI node
by Sylwester Nawrocki 09 Mar '18

09 Mar '18

Hi Inki, Cc: alsa-devel(a)alsa-project.org On 03/08/2018 09:15 AM, Inki Dae wrote: > By the way, it seems 'sound-dai-cells' property never affect Exynos4210/4212> 5420/5433. It seems that even through ALSA TM2 audio driver(tm2_wm5110.c) > exists the driver never check the property. > > However, this patch adds below description. > > "Optional properties for Exynos 4210, 4212, 5420 and 5433" > > Is there a possibility for other boards based on Exynos4210/4212/5420/5433 > SoC to use this property later? All these SoCs have the HDMI IP block which has one input DAI, connected internally over I2S bus with the IS2 controller. I think there is no advantage in limiting ourselves now only to SoC's for which we currently rely on that DT property in current kernel code, just to update this documentation later when we actually put the property in dts files. In case of exynos5420 we already require #sound-dai-cells for Odroid and I have also a patch for exynos5420-peach-pit board which will need it as well. As far as exynos4210 and exynos4212 are concerned it's a matter of adding support for Odroid-U3, then we will also need this property because we are going to use "multi-codec" (HDMI and external I2S0 pins for CODEC are wired in parallel). In case of exynos5433 it just happens that the code in current driver doesn't require #sound-dai-cells property - one of the reasons I made it this way was to avoid dependency on dts, but it doesn't imply we should describe the HW in DT incompletely. Once the property is in dtbs we can update the driver to use more generic code, instead of open coding things. Actually I have forgotten to add also exynos5250 to the list. -- Regards, Sylwester

2 2

[alsa-devel] [PATCH 0/9] Enablement of BT I2S controller instance for AMD APUs
by Vijendar Mukunda 09 Mar '18

09 Mar '18

This patch set updates Audio CoProcessor (ACP) audio drivers to enable BT I2S controller instance. Default enabled I2S controller instance is I2S SP instance. There is a requirement to enable BT I2S controller Instance along with I2S SP controller instance. This patch set bring up functionality to render & capture on BT I2S controller instance. The current code is based on asoc-next, but I'm happy to rebase on whatever tree this ends up going through if there are any problems applying. Vijendar Mukunda (9): ASoC: amd: renaming pcm substream names and bytescount params ASoC: amd: Coding style changes for acp dma driver ASoC: amd: dma driver changes for BT I2S controller instance ASoC: amd: dma descriptor changes for BT I2S Instance ASoC: amd: Interrupt handler changes for BT I2S instance ASoC: amd: pcm callbacks modifications for bt i2s instance ASoC: amd: modifications in dma stop sequence ASoC: amd: 16bit resolution support for bt i2s instance ASoC: amd: enabling bt i2s config after acp reset sound/soc/amd/acp-pcm-dma.c | 623 ++++++++++++++++++++++++++++++++------------ sound/soc/amd/acp.h | 61 ++++- 2 files changed, 514 insertions(+), 170 deletions(-) -- 2.7.4

3 16

[alsa-devel] [PATCH] ASoC: TSCS42xx: make const array norm_addrs static, reduces object code size
by Colin King 09 Mar '18

09 Mar '18

From: Colin Ian King <colin.king(a)canonical.com> Don't populate the const array norm_addrs on the stack, instead make it static. Makes the object code smaller by over 230 bytes. Also re-format array data as the insertion of the static keywork made the first line overly long. Before: text data bss dec hex filename 53780 34752 256 88788 15ad4 linux/sound/soc/codecs/tscs42xx.o After: text data bss dec hex filename 53461 34840 256 88557 159ed linux/sound/soc/codecs/tscs42xx.o (gcc version 7.2.0 x86_64) Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/codecs/tscs42xx.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/tscs42xx.c b/sound/soc/codecs/tscs42xx.c index e7661d0315e6..205a55a0329e 100644 --- a/sound/soc/codecs/tscs42xx.c +++ b/sound/soc/codecs/tscs42xx.c @@ -1317,11 +1317,13 @@ static struct snd_soc_codec_driver soc_codec_dev_tscs42xx = { static inline void init_coeff_ram_cache(struct tscs42xx *tscs42xx) { - const u8 norm_addrs[] = { 0x00, 0x05, 0x0a, 0x0f, 0x14, 0x19, 0x1f, - 0x20, 0x25, 0x2a, 0x2f, 0x34, 0x39, 0x3f, 0x40, 0x45, 0x4a, - 0x4f, 0x54, 0x59, 0x5f, 0x60, 0x65, 0x6a, 0x6f, 0x74, 0x79, - 0x7f, 0x80, 0x85, 0x8c, 0x91, 0x96, 0x97, 0x9c, 0xa3, 0xa8, - 0xad, 0xaf, 0xb0, 0xb5, 0xba, 0xbf, 0xc4, 0xc9, }; + static const u8 norm_addrs[] = { + 0x00, 0x05, 0x0a, 0x0f, 0x14, 0x19, 0x1f, 0x20, 0x25, 0x2a, + 0x2f, 0x34, 0x39, 0x3f, 0x40, 0x45, 0x4a, 0x4f, 0x54, 0x59, + 0x5f, 0x60, 0x65, 0x6a, 0x6f, 0x74, 0x79, 0x7f, 0x80, 0x85, + 0x8c, 0x91, 0x96, 0x97, 0x9c, 0xa3, 0xa8, 0xad, 0xaf, 0xb0, + 0xb5, 0xba, 0xbf, 0xc4, 0xc9, + }; u8 *coeff_ram = tscs42xx->coeff_ram; int i; -- 2.15.1

3 2

[alsa-devel] [PATCH] ASoC: cygnus: remove redundant assignment to pointer 'res'
by Colin King 08 Mar '18

08 Mar '18

From: Colin Ian King <colin.king(a)canonical.com> The pointer res is being initialized with a value that is never read and re-assigned immediately after, hence the initialization is redundant and can be removed. Cleans up clang warning: sound/soc/bcm/cygnus-ssp.c:1284:19: warning: Value stored to 'res' during its initialization is never read Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/bcm/cygnus-ssp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c index abafadc0b534..b733f1446353 100644 --- a/sound/soc/bcm/cygnus-ssp.c +++ b/sound/soc/bcm/cygnus-ssp.c @@ -1281,7 +1281,7 @@ static int cygnus_ssp_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct device_node *child_node; - struct resource *res = pdev->resource; + struct resource *res; struct cygnus_audio *cygaud; int err = -EINVAL; int node_count; -- 2.15.1

3 2