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

[PATCH 0/6] ASoC: fsl: fix kernel-doc
by Pierre-Louis Bossart 02 Jul '20

02 Jul '20

This cleanup patchset is only about kernel-doc, mostly trivial edits and format correction. Pierre-Louis Bossart (6): ASoC: fsl: fsl_ssi_dbg: remove spurious kernel-doc comment start ASoC: fsl: fsl_ssi: fix kernel-doc ASoC: fsl: fsl-asoc-card: fix kernel-doc ASoC: fsl: fsl_spdif: fix kernel-doc ASoC: fsl: fsl_asrc: fix kernel-doc ASoC: fsl: fsl_esai: fix kernel-doc sound/soc/fsl/fsl-asoc-card.c | 21 +++++------ sound/soc/fsl/fsl_asrc.c | 57 +++++++++++++++++++--------- sound/soc/fsl/fsl_esai.c | 32 +++++++++------- sound/soc/fsl/fsl_spdif.c | 5 ++- sound/soc/fsl/fsl_ssi.c | 70 ++++++++++++++++++++++------------- sound/soc/fsl/fsl_ssi_dbg.c | 4 +- 6 files changed, 115 insertions(+), 74 deletions(-) -- 2.25.1

2 14

[PATCH 0/7] ASoC: codecs: wm/cs: fix kernel-doc and W=1 warnings
by Pierre-Louis Bossart 02 Jul '20

02 Jul '20

I've been doing a lot of cleanups to get to zero warnings with W=1, here's the first batch for Cirrus/Wolfson codecs. Pierre-Louis Bossart (7): ASoC: codecs: cs4270: fix kernel-doc ASoC: codecs: cs42l42: remove always-true comparisons ASoC: codecs: wm8986: fix missing kernel-doc arguments ASoC: codecs: wm8960: fix kernel-doc ASoC: codecs: wm9713: remove spurious kernel-doc comment start ASoC: codecs: wm8994: fix kernel-doc ASoC: codecs: wm8400: add _maybe_unused as needed sound/soc/codecs/cs4270.c | 4 ++-- sound/soc/codecs/cs42l42.c | 9 +++------ sound/soc/codecs/wm8400.c | 6 +++--- sound/soc/codecs/wm8960.c | 2 +- sound/soc/codecs/wm8994.c | 4 ++++ sound/soc/codecs/wm8996.c | 3 +++ sound/soc/codecs/wm9713.c | 2 +- 7 files changed, 17 insertions(+), 13 deletions(-) base-commit: a2b782d59c57cb6f673dbb4804ffc500336d7a54 -- 2.25.1

3 14

[PATCH alsa-lib 1/8] topology: decode: fix channel map memory allocation
by Piotr Maziarz 02 Jul '20

02 Jul '20

Without proper memory allocation behaviour was undefined. Signed-off-by: Piotr Maziarz <piotrx.maziarz(a)linux.intel.com> --- src/topology/ctl.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/topology/ctl.c b/src/topology/ctl.c index 90241b6..c8c7e94 100644 --- a/src/topology/ctl.c +++ b/src/topology/ctl.c @@ -1330,7 +1330,6 @@ int tplg_decode_control_enum1(snd_tplg_t *tplg, void *bin, size_t size) { struct snd_soc_tplg_enum_control *ec = bin; - struct snd_tplg_channel_map_template cmt; int i; if (size < sizeof(*ec)) { @@ -1375,11 +1374,11 @@ int tplg_decode_control_enum1(snd_tplg_t *tplg, } } - et->map = &cmt; - memset(&cmt, 0, sizeof(cmt)); - cmt.num_channels = ec->num_channels; - for (i = 0; i < cmt.num_channels; i++) { - struct snd_tplg_channel_elem *channel = &cmt.channel[i]; + et->map = tplg_calloc(heap, sizeof(struct snd_tplg_channel_map_template)); + et->map->num_channels = ec->num_channels; + for (i = 0; i < et->map->num_channels; i++) { + struct snd_tplg_channel_elem *channel = &et->map->channel[i]; + tplg_log(tplg, 'D', pos + ((void *)&ec->channel[i] - (void *)ec), "enum: channel size %d", ec->channel[i].size); channel->reg = ec->channel[i].reg; -- 2.7.4

2 11

Re: [PATCH] riscv: asm/gdb_xml.h: use __maybe_used to make W=1 warnings go away
by Pierre-Louis Bossart 02 Jul '20

02 Jul '20

On 7/1/20 9:04 PM, Vincent Chen wrote: > On Thu, Jul 2, 2020 at 2:48 AM Pierre-Louis Bossart > <pierre-louis.bossart(a)linux.intel.com> wrote: >> >> 0day/kbuild reports warnings with the ASoC codecs compiled with W=1. >> >> In file included from arch/riscv/include/asm/kgdb.h:109, >> from include/linux/kgdb.h:20, >> from include/linux/fb.h:5, >> from include/drm/drm_crtc.h:31, >> from sound/soc/codecs/hdmi-codec.c:19: >> >> arch/riscv/include/asm/gdb_xml.h:23:19: warning: >> 'riscv_gdb_stub_cpuxml' defined but not used [-Wunused-const-variable=] >> 23 | static const char riscv_gdb_stub_cpuxml[2048] = >> | ^~~~~~~~~~~~~~~~~~~~~ >> arch/riscv/include/asm/gdb_xml.h:16:19: warning: >> 'riscv_gdb_stub_target_desc' defined but not used [-Wunused-const-variable=] >> 16 | static const char riscv_gdb_stub_target_desc[256] = >> | ^~~~~~~~~~~~~~~~~~~~~~~~~~ >> arch/riscv/include/asm/gdb_xml.h:13:19: warning: >> 'gdb_xfer_read_cpuxml' defined but not used [-Wunused-const-variable=] >> 13 | static const char gdb_xfer_read_cpuxml[39] = >> | ^~~~~~~~~~~~~~~~~~~~ >> arch/riscv/include/asm/gdb_xml.h:10:19: warning: >> 'gdb_xfer_read_target' defined but not used [-Wunused-const-variable=] >> 10 | static const char gdb_xfer_read_target[31] = "qXfer:features:read:target.xml:"; >> | ^~~~~~~~~~~~~~~~~~~~ >> arch/riscv/include/asm/gdb_xml.h:7:19: warning: >> 'riscv_gdb_stub_feature' defined but not used [-Wunused-const-variable=] >> 7 | static const char riscv_gdb_stub_feature[64] = >> | ^~~~~~~~~~~~~~~~~~~~~~ >> >> Reported-by: kernel test robot <lkp(a)intel.com> >> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> >> --- >> >> I don't know if this is the right way of solving this issue but this >> error is now consistently thrown in kbuild compile-test reports w/ >> W=1. >> > > Dear Pierre-Louis Bossart: > Thanks for your modifications. I have fixed the warnings in my latest > KGDB patchset and sent it out, but the merged KGDB patchset is not my > latest version. > I have sent a patch set to complement the missing ports, and I think > these warnings would disappear after this patch has been accepted and > merged. > > Here is the patch to fix this warning: > http://lists.infradead.org/pipermail/linux-riscv/2020-June/000660.html Thank you Vincent, let's drop my hacky patch then.

1 0

[PATCH] ASoC: dt-bindings: simple-card: care missing address #address-cells
by Kuninori Morimoto 02 Jul '20

02 Jul '20

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Current simple-card will get below error, because it doesn't care about #address-cells at some part. DTC Documentation/devicetree/bindings/sound/simple-card.example.dt.yaml Documentation/devicetree/bindings/sound/simple-card.example.dts:171.46-173.15: \ Warning (unit_address_vs_reg): /example-4/sound/simple-audio-card,cpu@0: \ node has a unit name, but no reg or ranges property Documentation/devicetree/bindings/sound/simple-card.example.dts:175.37-177.15: \ Warning (unit_address_vs_reg): /example-4/sound/simple-audio-card,cpu@1: \ node has a unit name, but no reg or ranges property ... This patch fixup this issue. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- .../bindings/sound/simple-card.yaml | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/simple-card.yaml b/Documentation/devicetree/bindings/sound/simple-card.yaml index cb2bb5fac0e1..6c4c2c6d6d3c 100644 --- a/Documentation/devicetree/bindings/sound/simple-card.yaml +++ b/Documentation/devicetree/bindings/sound/simple-card.yaml @@ -208,6 +208,11 @@ patternProperties: reg: maxItems: 1 + "#address-cells": + const: 1 + "#size-cells": + const: 0 + # common properties frame-master: $ref: "#/definitions/frame-master" @@ -288,7 +293,6 @@ examples: #address-cells = <1>; #size-cells = <0>; - simple-audio-card,dai-link@0 { /* I2S - HDMI */ reg = <0>; format = "i2s"; @@ -392,11 +396,15 @@ examples: simple-audio-card,routing = "ak4642 Playback", "DAI0 Playback", "ak4642 Playback", "DAI1 Playback"; + #address-cells = <1>; + #size-cells = <0>; dpcmcpu: simple-audio-card,cpu@0 { + reg = <0>; sound-dai = <&rcar_sound 0>; }; simple-audio-card,cpu@1 { + reg = <1>; sound-dai = <&rcar_sound 1>; }; @@ -427,7 +435,12 @@ examples: "pcm3168a Playback", "DAI3 Playback", "pcm3168a Playback", "DAI4 Playback"; + #address-cells = <1>; + #size-cells = <0>; + simple-audio-card,dai-link@0 { + reg = <0>; + format = "left_j"; bitclock-master = <&sndcpu0>; frame-master = <&sndcpu0>; @@ -441,22 +454,30 @@ examples: }; simple-audio-card,dai-link@1 { + reg = <1>; + format = "i2s"; bitclock-master = <&sndcpu1>; frame-master = <&sndcpu1>; convert-channels = <8>; /* TDM Split */ + #address-cells = <1>; + #size-cells = <0>; sndcpu1: cpu@0 { + reg = <0>; sound-dai = <&rcar_sound 1>; }; cpu@1 { + reg = <1>; sound-dai = <&rcar_sound 2>; }; cpu@2 { + reg = <2>; sound-dai = <&rcar_sound 3>; }; cpu@3 { + reg = <3>; sound-dai = <&rcar_sound 4>; }; codec { @@ -468,6 +489,8 @@ examples: }; simple-audio-card,dai-link@2 { + reg = <2>; + format = "i2s"; bitclock-master = <&sndcpu2>; frame-master = <&sndcpu2>; -- 2.17.1

2 3

[PATCH 2/2] ASoC: wm8974: remove unsupported clock mode
by puyou.lu＠gmail.com 02 Jul '20

02 Jul '20

From: Puyou Lu <puyou.lu(a)gmail.com> In DSP_A mode, BIT7 of IFACE should bit 0 according to datasheet (ie. inverted frame clock is not support in this mode). Signed-off-by: Puyou Lu <puyou.lu(a)gmail.com> --- sound/soc/codecs/wm8974.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index 764bf93..7cfc896 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -474,6 +474,10 @@ static int wm8974_set_dai_fmt(struct snd_soc_dai *codec_dai, iface |= 0x0008; break; case SND_SOC_DAIFMT_DSP_A: + if ((fmt & SND_SOC_DAIFMT_INV_MASK) == SND_SOC_DAIFMT_IB_IF || + (fmt & SND_SOC_DAIFMT_INV_MASK) == SND_SOC_DAIFMT_NB_IF) { + return -EINVAL; + } iface |= 0x00018; break; default: -- 2.7.4

2 1

[PATCH 1/2] ASoC: wm8974: fix Boost Mixer Aux Switch
by puyou.lu＠gmail.com 02 Jul '20

02 Jul '20

From: Puyou Lu <puyou.lu(a)gmail.com> Clear BIT6 of INPPGA means not muted (Switch On). Signed-off-by: Puyou Lu <puyou.lu(a)gmail.com> --- sound/soc/codecs/wm8974.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index 06ba365..764bf93 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -186,7 +186,7 @@ SOC_DAPM_SINGLE("PCM Playback Switch", WM8974_MONOMIX, 0, 1, 0), /* Boost mixer */ static const struct snd_kcontrol_new wm8974_boost_mixer[] = { -SOC_DAPM_SINGLE("Aux Switch", WM8974_INPPGA, 6, 1, 0), +SOC_DAPM_SINGLE("Aux Switch", WM8974_INPPGA, 6, 1, 1), }; /* Input PGA */ -- 2.7.4

2 1

[PATCH AUTOSEL 5.4 13/40] ALSA: hda: Intel: add missing PCI IDs for ICL-H, TGL-H and EKL
by Sasha Levin 02 Jul '20

02 Jul '20

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> [ Upstream commit d50313a5a0d803bcf55121a2b82086633060d05e ] Mirror PCI ids used for SOF. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Link: https://lore.kernel.org/r/20200617164909.18225-1-pierre-louis.bossart@linux… Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/pci/hda/hda_intel.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 612441508e80a..95b0fdffc504c 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2433,6 +2433,9 @@ static const struct pci_device_id azx_ids[] = { /* Icelake */ { PCI_DEVICE(0x8086, 0x34c8), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, + /* Icelake-H */ + { PCI_DEVICE(0x8086, 0x3dc8), + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, /* Jasperlake */ { PCI_DEVICE(0x8086, 0x38c8), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, @@ -2441,9 +2444,14 @@ static const struct pci_device_id azx_ids[] = { /* Tigerlake */ { PCI_DEVICE(0x8086, 0xa0c8), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, + /* Tigerlake-H */ + { PCI_DEVICE(0x8086, 0x43c8), + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, /* Elkhart Lake */ { PCI_DEVICE(0x8086, 0x4b55), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, + { PCI_DEVICE(0x8086, 0x4b58), + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, /* Broxton-P(Apollolake) */ { PCI_DEVICE(0x8086, 0x5a98), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON }, -- 2.25.1

1 0

[PATCH AUTOSEL 5.4 11/40] ASoC: SOF: Intel: add PCI IDs for ICL-H and TGL-H
by Sasha Levin 02 Jul '20

02 Jul '20

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> [ Upstream commit c8d2e2bfaeffa0f914330e8b4e45b986c8d30b58 ] Usually the DSP is not traditionally enabled on H skews but this might be used moving forward. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Link: https://lore.kernel.org/r/20200617164755.18104-4-pierre-louis.bossart@linux… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/sof-pci-dev.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index 3f79cd03507c9..9e2ae6e62e7f9 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -410,8 +410,11 @@ static const struct pci_device_id sof_pci_ids[] = { .driver_data = (unsigned long)&skl_desc}, #endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE) - { PCI_DEVICE(0x8086, 0x34C8), + { PCI_DEVICE(0x8086, 0x34C8), /* ICL-LP */ .driver_data = (unsigned long)&icl_desc}, + { PCI_DEVICE(0x8086, 0x3dc8), /* ICL-H */ + .driver_data = (unsigned long)&icl_desc}, + #endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP) { PCI_DEVICE(0x8086, 0x02c8), @@ -424,8 +427,11 @@ static const struct pci_device_id sof_pci_ids[] = { .driver_data = (unsigned long)&cml_desc}, #endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE) - { PCI_DEVICE(0x8086, 0xa0c8), + { PCI_DEVICE(0x8086, 0xa0c8), /* TGL-LP */ .driver_data = (unsigned long)&tgl_desc}, + { PCI_DEVICE(0x8086, 0x43c8), /* TGL-H */ + .driver_data = (unsigned long)&tgl_desc}, + #endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_ELKHARTLAKE) { PCI_DEVICE(0x8086, 0x4b55), -- 2.25.1

1 0

[PATCH AUTOSEL 5.4 10/40] ASoC: SOF: Intel: add PCI ID for CometLake-S
by Sasha Levin 02 Jul '20

02 Jul '20

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> [ Upstream commit 258fb4f4c34a0db9d3834aba6784d7b322176bb9 ] Mirror ID added for legacy HDaudio Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Link: https://lore.kernel.org/r/20200617164755.18104-3-pierre-louis.bossart@linux… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/sof-pci-dev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index d66412a778739..3f79cd03507c9 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -420,6 +420,8 @@ static const struct pci_device_id sof_pci_ids[] = { #if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H) { PCI_DEVICE(0x8086, 0x06c8), .driver_data = (unsigned long)&cml_desc}, + { PCI_DEVICE(0x8086, 0xa3f0), /* CML-S */ + .driver_data = (unsigned long)&cml_desc}, #endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE) { PCI_DEVICE(0x8086, 0xa0c8), -- 2.25.1

1 0