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

[alsa-devel] [PATCH] ASoC: max98373: add 88200 and 96000 sampling rate support
by chunguo feng 31 Jul '19

31 Jul '19

From: fengchunguo <chunguo.feng(a)amlogic.com> 88200 and 96000 sampling rate was not enabled on driver, so can't be played. The error information: max98373 3-0031：rate 96000 not supported max98373 3-0031：ASoC: can't set max98373-aif1 hw params: -22 Signed-off-by: fengchunguo <chunguo.feng(a)amlogic.com> --- sound/soc/codecs/max98373.c | 6 ++++++ sound/soc/codecs/max98373.h | 2 ++ 2 files changed, 8 insertions(+) mode change 100644 => 100755 sound/soc/codecs/max98373.c mode change 100644 => 100755 sound/soc/codecs/max98373.h diff --git a/sound/soc/codecs/max98373.c b/sound/soc/codecs/max98373.c old mode 100644 new mode 100755 index 528695cd6a1c..8c601a3ebc27 --- a/sound/soc/codecs/max98373.c +++ b/sound/soc/codecs/max98373.c @@ -267,6 +267,12 @@ static int max98373_dai_hw_params(struct snd_pcm_substream *substream, case 48000: sampling_rate = MAX98373_PCM_SR_SET1_SR_48000; break; + case 88200: + sampling_rate = MAX98373_PCM_SR_SET1_SR_88200; + break; + case 96000: + sampling_rate = MAX98373_PCM_SR_SET1_SR_96000; + break; default: dev_err(component->dev, "rate %d not supported\n", params_rate(params)); diff --git a/sound/soc/codecs/max98373.h b/sound/soc/codecs/max98373.h old mode 100644 new mode 100755 index f6a37aa02f26..a59e51355a84 --- a/sound/soc/codecs/max98373.h +++ b/sound/soc/codecs/max98373.h @@ -130,6 +130,8 @@ #define MAX98373_PCM_SR_SET1_SR_32000 (0x6 << 0) #define MAX98373_PCM_SR_SET1_SR_44100 (0x7 << 0) #define MAX98373_PCM_SR_SET1_SR_48000 (0x8 << 0) +#define MAX98373_PCM_SR_SET1_SR_88200 (0x9 << 0) +#define MAX98373_PCM_SR_SET1_SR_96000 (0xA << 0) /* MAX98373_R2028_PCM_SR_SETUP_2 */ #define MAX98373_PCM_SR_SET2_SR_MASK (0xF << 4) -- 2.22.0

2 1

[alsa-devel] [PATCH -next 00/34] ASoC: use devm_platform_ioremap_resource() to simplify code
by YueHaibing 31 Jul '19

31 Jul '19

devm_platform_ioremap_resource() internally have platform_get_resource() and devm_ioremap_resource() in it. So instead of calling them separately use devm_platform_ioremap_resource() directly. YueHaibing (34): ASoC: tegra20_das: use devm_platform_ioremap_resource() to simplify code ASoC: tegra: use devm_platform_ioremap_resource() to simplify code ASoC: rockchip: use devm_platform_ioremap_resource() to simplify code ASoC: ep93xx-i2s: use devm_platform_ioremap_resource() to simplify code ASoC: mt8173: use devm_platform_ioremap_resource() to simplify code ASoC: mt6797: use devm_platform_ioremap_resource() to simplify code ASoC: imx-audmux: use devm_platform_ioremap_resource() to simplify code ASoC: fsl_audmix: use devm_platform_ioremap_resource() to simplify code ASoC: bcm2835-i2s: use devm_platform_ioremap_resource() to simplify code ASoC: sirf: use devm_platform_ioremap_resource() to simplify code ASoC: mxs-saif: use devm_platform_ioremap_resource() to simplify code ASoC: spear: use devm_platform_ioremap_resource() to simplify code ASoC: kirkwood-i2s: use devm_platform_ioremap_resource() to simplify code ASoC: xtfpga-i2s: use devm_platform_ioremap_resource() to simplify code ASoC: stm32: sai: use devm_platform_ioremap_resource() to simplify code ASoC: codecs: msm8916-wcd: use devm_platform_ioremap_resource() to simplify code ASoC: codecs: jz4725b: use devm_platform_ioremap_resource() to simplify code ASoC: mmp-sspa: use devm_platform_ioremap_resource() to simplify code ASoC: jz4740: use devm_platform_ioremap_resource() to simplify code ASoC: inno_rk3036: use devm_platform_ioremap_resource() to simplify code ASoC: uniphier: evea: use devm_platform_ioremap_resource() to simplify code ASoC: uniphier: aio-dma: use devm_platform_ioremap_resource() to simplify code ASoC: psc-ac97: use devm_platform_ioremap_resource() to simplify code ASoC: au1x: psc-i2s: use devm_platform_ioremap_resource() to simplify code ASoC: meson: g12a-tohdmitx: use devm_platform_ioremap_resource() to simplify code ASoC: meson: axg-tdm-formatter: use devm_platform_ioremap_resource() to simplify code ASoC: meson: axg-pdm: use devm_platform_ioremap_resource() to simplify code ASoC: meson: axg-spdifin: use devm_platform_ioremap_resource() to simplify code ASoC: meson: axg-spdifout: use devm_platform_ioremap_resource() to simplify code ASoC: meson: axg-fifo: use devm_platform_ioremap_resource() to simplify code ASoC: xlnx: use devm_platform_ioremap_resource() to simplify code ASoC: sun8i-codec-analog: use devm_platform_ioremap_resource() to simplify code ASoC: sunxi: sun50i-codec-analog: use devm_platform_ioremap_resource() to simplify code ASoC: sun8i-codec: use devm_platform_ioremap_resource() to simplify code sound/soc/au1x/psc-ac97.c | 5 ++--- sound/soc/au1x/psc-i2s.c | 5 ++--- sound/soc/bcm/bcm2835-i2s.c | 4 +--- sound/soc/cirrus/ep93xx-i2s.c | 4 +--- sound/soc/codecs/inno_rk3036.c | 4 +--- sound/soc/codecs/jz4725b.c | 4 +--- sound/soc/codecs/jz4740.c | 4 +--- sound/soc/codecs/msm8916-wcd-digital.c | 4 +--- sound/soc/codecs/rk3328_codec.c | 4 +--- sound/soc/fsl/fsl_audmix.c | 4 +--- sound/soc/fsl/imx-audmux.c | 4 +--- sound/soc/kirkwood/kirkwood-i2s.c | 4 +--- sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 5 +---- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 4 +--- sound/soc/meson/axg-fifo.c | 4 +--- sound/soc/meson/axg-pdm.c | 4 +--- sound/soc/meson/axg-spdifin.c | 4 +--- sound/soc/meson/axg-spdifout.c | 4 +--- sound/soc/meson/axg-tdm-formatter.c | 4 +--- sound/soc/meson/g12a-tohdmitx.c | 4 +--- sound/soc/mxs/mxs-saif.c | 5 +---- sound/soc/pxa/mmp-sspa.c | 4 +--- sound/soc/sirf/sirf-usp.c | 4 +--- sound/soc/spear/spdif_in.c | 5 ++--- sound/soc/stm/stm32_sai.c | 4 +--- sound/soc/sunxi/sun50i-codec-analog.c | 4 +--- sound/soc/sunxi/sun8i-codec-analog.c | 4 +--- sound/soc/sunxi/sun8i-codec.c | 4 +--- sound/soc/tegra/tegra20_das.c | 4 +--- sound/soc/tegra/tegra30_i2s.c | 4 +--- sound/soc/uniphier/aio-dma.c | 4 +--- sound/soc/uniphier/evea.c | 4 +--- sound/soc/xilinx/xlnx_i2s.c | 4 +--- sound/soc/xilinx/xlnx_spdif.c | 3 +-- sound/soc/xtensa/xtfpga-i2s.c | 4 +--- 35 files changed, 38 insertions(+), 106 deletions(-) -- 2.7.4

2 68

[alsa-devel] [PATCH] ASoC: meson: g12a-tohdmitx: override codec2codec params
by Jerome Brunet 31 Jul '19

31 Jul '19

So far, forwarding the hw_params of the input to output relied on the .hw_params() callback of the cpu side of the codec2codec link to be called first. This is a bit weak. Instead, override the stream params of the codec2codec to link to set it up correctly. Signed-off-by: Jerome Brunet <jbrunet(a)baylibre.com> --- sound/soc/meson/g12a-tohdmitx.c | 34 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/sound/soc/meson/g12a-tohdmitx.c b/sound/soc/meson/g12a-tohdmitx.c index 707ccb192e4c..9943c807ec5d 100644 --- a/sound/soc/meson/g12a-tohdmitx.c +++ b/sound/soc/meson/g12a-tohdmitx.c @@ -28,7 +28,7 @@ #define CTRL0_SPDIF_CLK_SEL BIT(0) struct g12a_tohdmitx_input { - struct snd_pcm_hw_params params; + struct snd_soc_pcm_stream params; unsigned int fmt; }; @@ -225,26 +225,17 @@ static int g12a_tohdmitx_input_hw_params(struct snd_pcm_substream *substream, { struct g12a_tohdmitx_input *data = dai->playback_dma_data; - /* Save the stream params for the downstream link */ - memcpy(&data->params, params, sizeof(*params)); + data->params.rates = snd_pcm_rate_to_rate_bit(params_rate(params)); + data->params.rate_min = params_rate(params); + data->params.rate_max = params_rate(params); + data->params.formats = 1 << params_format(params); + data->params.channels_min = params_channels(params); + data->params.channels_max = params_channels(params); + data->params.sig_bits = dai->driver->playback.sig_bits; return 0; } -static int g12a_tohdmitx_output_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params, - struct snd_soc_dai *dai) -{ - struct g12a_tohdmitx_input *in_data = - g12a_tohdmitx_get_input_data(dai->capture_widget); - - if (!in_data) - return -ENODEV; - - memcpy(params, &in_data->params, sizeof(*params)); - - return 0; -} static int g12a_tohdmitx_input_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) @@ -266,6 +257,14 @@ static int g12a_tohdmitx_output_startup(struct snd_pcm_substream *substream, if (!in_data) return -ENODEV; + if (WARN_ON(!rtd->dai_link->params)) { + dev_warn(dai->dev, "codec2codec link expected\n"); + return -EINVAL; + } + + /* Replace link params with the input params */ + rtd->dai_link->params = &in_data->params; + if (!in_data->fmt) return 0; @@ -278,7 +277,6 @@ static const struct snd_soc_dai_ops g12a_tohdmitx_input_ops = { }; static const struct snd_soc_dai_ops g12a_tohdmitx_output_ops = { - .hw_params = g12a_tohdmitx_output_hw_params, .startup = g12a_tohdmitx_output_startup, }; -- 2.21.0

2 1

[alsa-devel] [PATCH] MAINTAINERS: Update Intel ASoC drivers maintainers
by Cezary Rojewski 31 Jul '19

31 Jul '19

Adding myself to Intel ASoC drivers maintainers list. Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 783569e3c4b4..0db421933d0c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8044,6 +8044,7 @@ S: Maintained F: drivers/video/fbdev/i810/ INTEL ASoC DRIVERS +M: Cezary Rojewski <cezary.rojewski(a)intel.com> M: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> M: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> M: Jie Yang <yang.jie(a)linux.intel.com> -- 2.17.1

3 2

[alsa-devel] [PATCH] ASoC: ti: Mark expected switch fall-throughs
by Gustavo A. R. Silva 31 Jul '19

31 Jul '19

Mark switch cases where we are expecting to fall through. This patch fixes the following warning (Building: arm): sound/soc/ti/n810.c: In function ‘n810_ext_control’: sound/soc/ti/n810.c:48:10: warning: this statement may fall through [-Wimplicit-fallthrough=] line1l = 1; ~~~~~~~^~~ sound/soc/ti/n810.c:49:2: note: here case N810_JACK_HP: ^~~~ sound/soc/ti/rx51.c: In function ‘rx51_ext_control’: sound/soc/ti/rx51.c:57:6: warning: this statement may fall through [-Wimplicit-fallthrough=] hs = 1; ~~~^~~ sound/soc/ti/rx51.c:58:2: note: here case RX51_JACK_HP: ^~~~ Signed-off-by: Gustavo A. R. Silva <gustavo(a)embeddedor.com> --- sound/soc/ti/n810.c | 1 + sound/soc/ti/rx51.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sound/soc/ti/n810.c b/sound/soc/ti/n810.c index 2c3f2a4c1700..3ad2b6daf31e 100644 --- a/sound/soc/ti/n810.c +++ b/sound/soc/ti/n810.c @@ -46,6 +46,7 @@ static void n810_ext_control(struct snd_soc_dapm_context *dapm) switch (n810_jack_func) { case N810_JACK_HS: line1l = 1; + /* fall through */ case N810_JACK_HP: hp = 1; break; diff --git a/sound/soc/ti/rx51.c b/sound/soc/ti/rx51.c index bc6046534fa5..ccd0e8a07dd1 100644 --- a/sound/soc/ti/rx51.c +++ b/sound/soc/ti/rx51.c @@ -55,6 +55,7 @@ static void rx51_ext_control(struct snd_soc_dapm_context *dapm) break; case RX51_JACK_HS: hs = 1; + /* fall through */ case RX51_JACK_HP: hp = 1; break; -- 2.22.0

3 2

[alsa-devel] [PATCH] ASoC: cs4271: Fix a typo in the CS4171_NR_RATIOS
by Christophe JAILLET 31 Jul '19

31 Jul '19

This should be CS4271_NR_RATIOS. Fix it and use it. Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- sound/soc/codecs/cs4271.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c index 1d03a1348162..04b86a51e055 100644 --- a/sound/soc/codecs/cs4271.c +++ b/sound/soc/codecs/cs4271.c @@ -334,7 +334,7 @@ static struct cs4271_clk_cfg cs4271_clk_tab[] = { {0, CS4271_MODE1_MODE_4X, 256, CS4271_MODE1_DIV_2}, }; -#define CS4171_NR_RATIOS ARRAY_SIZE(cs4271_clk_tab) +#define CS4271_NR_RATIOS ARRAY_SIZE(cs4271_clk_tab) static int cs4271_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, @@ -383,13 +383,13 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream, val = CS4271_MODE1_MODE_4X; ratio = cs4271->mclk / cs4271->rate; - for (i = 0; i < CS4171_NR_RATIOS; i++) + for (i = 0; i < CS4271_NR_RATIOS; i++) if ((cs4271_clk_tab[i].master == cs4271->master) && (cs4271_clk_tab[i].speed_mode == val) && (cs4271_clk_tab[i].ratio == ratio)) break; - if (i == CS4171_NR_RATIOS) { + if (i == CS4271_NR_RATIOS) { dev_err(component->dev, "Invalid sample rate\n"); return -EINVAL; } -- 2.20.1

2 1

[alsa-devel] [PATCH 0/2] ASoC: Add uda1334 codec driver
by Andra Danciu 31 Jul '19

31 Jul '19

The first patch contains uda1334 documentation. The second patch contains the codec driver. Andra Danciu (2): dt-bindings: sound: Add bindings for UDA1334 codec ASoC: codecs: Add uda1334 codec driver .../devicetree/bindings/sound/uda1334.txt | 17 ++ sound/soc/codecs/Kconfig | 9 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/uda1334.c | 295 +++++++++++++++++++++ 4 files changed, 323 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/uda1334.txt create mode 100644 sound/soc/codecs/uda1334.c -- 2.11.0

2 4

Re: [alsa-devel] [Sound-open-firmware] [GIT PULL] SOF v1.3 firmware binaries
by Pierre-Louis Bossart 31 Jul '19

31 Jul '19

[fixed alsa-devel email] On 7/30/19 10:33 AM, Liam Girdwood wrote: > The following changes since commit dff98c6c57383fe343407bcb7b6e775e0b87274f: > > Merge branch 'master' of git://github.com/skeggsb/linux-firmware (2019-07-26 07:32:37 -0400) > > are available in the Git repository at: > > https://github.com/thesofproject/linux-firmware.git sof-v1.3 > > for you to fetch changes up to cde3a116cea96976125b9215b303edfda85c9b54: > > sof: Add Intel SOF V1.3 release firmware binaries. (2019-07-30 16:06:41 +0100) > > ---------------------------------------------------------------- > Liam Girdwood (1): > sof: Add Intel SOF V1.3 release firmware binaries. > > LICENCE.sof | 1090 ++++++++++++++++++++++++++ Humm, that LICENSE file needs to be double-checked. Is there any reason why the text of this LICENSE.sof is different the usual text, e.g. from the LICENSE.adsp_sst? You are missing both the first part: ***** INTEL BINARY FIRMWARE RELEASE LICENCE ******************************** Copyright (c) 2014-15 Intel Corporation. All rights reserved. Redistribution. Redistribution and use in binary form, without modification, are permitted provided that the following conditions are met: * Redistributions must reproduce the above copyright notice and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of Intel Corporation nor the names of its suppliers may be used to endorse or promote products derived from this software without specific prior written permission. * No reverse engineering, decompilation, or disassembly of this software is permitted. and the DISCLAIMER part, both of which seem pretty important to me. IANAL, but seeing only a patent clause looks odd. There should be a mention of redistribution and a clear disclaimer (not sure about the reverse engineering parts since the code is available it makes no sense). > WHENCE | 33 + > intel/sof/apl/intel/sof-apl-v1.3.ri | Bin 0 -> 270336 bytes > intel/sof/bdw/sof-bdw-v1.3.ri | Bin 0 -> 100144 bytes > intel/sof/byt/sof-byt-v1.3.ri | Bin 0 -> 89668 bytes > intel/sof/cht/sof-cht-v1.3.ri | Bin 0 -> 90484 bytes > intel/sof/cnl/intel/sof-cnl-v1.3-6cc8da10.ri | Bin 0 -> 274432 bytes > intel/sof/icl/intel/sof-icl-v1.3.ri | Bin 0 -> 278528 bytes There are two types of platforms, the ones which require the Intel firmware to be signed with a private production key and the ones that are signed with the SOF community key. if we have a single directory, then how do we deal with the two cases? It's not even clear to me which of the two cases are handled here. > intel/sof/sof-apl.ri | 1 + > intel/sof/sof-bdw.ri | 1 + > intel/sof/sof-byt.ri | 1 + > intel/sof/sof-cht.ri | 1 + > intel/sof/sof-cml.ri | 1 + > intel/sof/sof-cnl.ri | 1 + > intel/sof/sof-glk.ri | 1 + > intel/sof/sof-icl.ri | 1 + > intel/sof/sof-whl.ri | 1 + unless I am missing something, we don't have any tables in the Linux kernel for the WHL and CML configurations, and IIRC we only generate sof-cnl.ri. Is there actually a user for sof-whl.ri and sof-cml.ri? > 17 files changed, 1132 insertions(+) > create mode 100644 LICENCE.sof > create mode 100644 intel/sof/apl/intel/sof-apl-v1.3.ri > create mode 100644 intel/sof/bdw/sof-bdw-v1.3.ri > create mode 100644 intel/sof/byt/sof-byt-v1.3.ri > create mode 100644 intel/sof/cht/sof-cht-v1.3.ri > create mode 100644 intel/sof/cnl/intel/sof-cnl-v1.3-6cc8da10.ri > create mode 100644 intel/sof/icl/intel/sof-icl-v1.3.ri > create mode 120000 intel/sof/sof-apl.ri > create mode 120000 intel/sof/sof-bdw.ri > create mode 120000 intel/sof/sof-byt.ri > create mode 120000 intel/sof/sof-cht.ri > create mode 120000 intel/sof/sof-cml.ri > create mode 120000 intel/sof/sof-cnl.ri > create mode 120000 intel/sof/sof-glk.ri > create mode 120000 intel/sof/sof-icl.ri > create mode 120000 intel/sof/sof-whl.ri > > _______________________________________________ > Sound-open-firmware mailing list > Sound-open-firmware(a)alsa-project.org > https://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware >

3 4

[alsa-devel] Patch Update for OpenFrame Sigmatel STAC9202
by Andy Davison 31 Jul '19

31 Jul '19

Hi all, Would anybody on this list have a little time to investigate this patch and bring it up to date for application against the latest 5.1 kernel, or indeed anything being actively developed? https://gist.github.com/andydvsn/c0c159f99bf19d5b30b5e5e156dcac3e This applies correctly against the 2.6.33 kernel, but I I lack the necessary ALSA knowledge and programming skills to make the appropriate corrections for anything more recent. Alternatively, any other advice on where I could seek help with this would be much appreciated. It is the only outstanding kernel issue for this device and would love to have it fixed. All the best, Andy.

3 5

[alsa-devel] [PATCH] ASoC: max98383: add 88200 and 96000 sampling rate support
by chunguo feng 31 Jul '19

31 Jul '19

From: fengchunguo <chunguo.feng(a)amlogic.com> 88200 and 96000 sampling rate was not enabled on driver, so can't be played. The error information: max98373 3-0031：rate 96000 not supported max98373 3-0031：ASoC: can't set max98373-aif1 hw params: -22 Signed-off-by: fengchunguo <chunguo.feng(a)amlogic.com> --- sound/soc/codecs/max98373.c | 6 ++++++ sound/soc/codecs/max98373.h | 2 ++ 2 files changed, 8 insertions(+) mode change 100644 => 100755 sound/soc/codecs/max98373.c mode change 100644 => 100755 sound/soc/codecs/max98373.h diff --git a/sound/soc/codecs/max98373.c b/sound/soc/codecs/max98373.c old mode 100644 new mode 100755 index 528695cd6a1c..8c601a3ebc27 --- a/sound/soc/codecs/max98373.c +++ b/sound/soc/codecs/max98373.c @@ -267,6 +267,12 @@ static int max98373_dai_hw_params(struct snd_pcm_substream *substream, case 48000: sampling_rate = MAX98373_PCM_SR_SET1_SR_48000; break; + case 88200: + sampling_rate = MAX98373_PCM_SR_SET1_SR_88200; + break; + case 96000: + sampling_rate = MAX98373_PCM_SR_SET1_SR_96000; + break; default: dev_err(component->dev, "rate %d not supported\n", params_rate(params)); diff --git a/sound/soc/codecs/max98373.h b/sound/soc/codecs/max98373.h old mode 100644 new mode 100755 index f6a37aa02f26..a59e51355a84 --- a/sound/soc/codecs/max98373.h +++ b/sound/soc/codecs/max98373.h @@ -130,6 +130,8 @@ #define MAX98373_PCM_SR_SET1_SR_32000 (0x6 << 0) #define MAX98373_PCM_SR_SET1_SR_44100 (0x7 << 0) #define MAX98373_PCM_SR_SET1_SR_48000 (0x8 << 0) +#define MAX98373_PCM_SR_SET1_SR_88200 (0x9 << 0) +#define MAX98373_PCM_SR_SET1_SR_96000 (0xA << 0) /* MAX98373_R2028_PCM_SR_SETUP_2 */ #define MAX98373_PCM_SR_SET2_SR_MASK (0xF << 4) -- 2.22.0

2 1