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

[alsa-devel] [PATCH v2 0/6] ASoC: sun4i-i2s: Updates to the driver
by codekipper＠gmail.com 13 Mar '18

13 Mar '18

From: Marcus Cooper <codekipper(a)gmail.com> Hi All, here is a patch series to add some improvements to the sun4i-i2s driver found whilst getting slave clocking and hdmi audio working on the newer SoCs. The original attempt had some changes related to the slave work but I've left them out for this release as I would still like to do some more investigations. The functionality included with the new patch set has been extended to cover more sample resolutions, multi-lane data output for HDMI audio and loopback so block testing can be made without an external codec. I've also moved away from using tdm to set the slot width and now use a dedicated property. This has been tested on a Pine64 using the ES9023 audio POT board (https://github.com/codekipper/linux-sunxi/commits/upstream) and HDMI audio (https://github.com/codekipper/linux-sunxi/commits/sunxi-wip-a64) BR, CK --- v2 changes compared to v1 are: - removed slave mode changes which didn't set mclk and bclk div. - removed use of tdm and now use a dedicated property. - fix commit message to better explain reason for sign extending - add divider calculations for newer SoCs. - add support for multi-lane i2s data output. - add support for 20, 24 and 32 bit samples. - add loopback property so blocks can be tested without a codec. --- Marcus Cooper (6): ASoC: sun4i-i2s: Add slot width override ASoC: sun4i-i2s: Add regmap field to sign extend sample ASoC: sun4i-i2s: Correct divider calculations ASoC: sun4i-i2s: Add multi-lane functionality ASoc: sun4i-i2s: Add 20, 24 and 32 bit support ASoC: sun4i-i2s: Add support for loopback .../devicetree/bindings/sound/sun4i-i2s.txt | 11 ++ sound/soc/sunxi/sun4i-i2s.c | 199 ++++++++++++++++----- 2 files changed, 170 insertions(+), 40 deletions(-) -- 2.16.2

6 17

[alsa-devel] [PATCH] ALSA: pcm: Use krealloc() for resizing the rules array
by Takashi Iwai 13 Mar '18

13 Mar '18

Just a minor simplification. Change from kcalloc() shouldn't matter as each array element is fully initialized. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/pcm_lib.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index a83152e7d387..f4a19509cccf 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1129,16 +1129,12 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond, if (constrs->rules_num >= constrs->rules_all) { struct snd_pcm_hw_rule *new; unsigned int new_rules = constrs->rules_all + 16; - new = kcalloc(new_rules, sizeof(*c), GFP_KERNEL); + new = krealloc(constrs->rules, new_rules * sizeof(*c), + GFP_KERNEL); if (!new) { va_end(args); return -ENOMEM; } - if (constrs->rules) { - memcpy(new, constrs->rules, - constrs->rules_num * sizeof(*c)); - kfree(constrs->rules); - } constrs->rules = new; constrs->rules_all = new_rules; } -- 2.16.2

2 1

[alsa-devel] [PATCH] ALSA: pcm: Remove VLA usage
by Takashi Iwai 13 Mar '18

13 Mar '18

A helper function used by snd_pcm_hw_refine() still keeps using VLA for timestamps of hw constraint rules that are non-fixed size. Let's replace the VLA with a simple kmalloc() array. Reference: https://lkml.org/lkml/2018/3/7/621 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/pcm_native.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 77ba50ddcf9e..756a9a3884a5 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -323,7 +323,7 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream, struct snd_pcm_hw_constraints *constrs = &substream->runtime->hw_constraints; unsigned int k; - unsigned int rstamps[constrs->rules_num]; + unsigned int *rstamps; unsigned int vstamps[SNDRV_PCM_HW_PARAM_LAST_INTERVAL + 1]; unsigned int stamp; struct snd_pcm_hw_rule *r; @@ -331,7 +331,7 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream, struct snd_mask old_mask; struct snd_interval old_interval; bool again; - int changed; + int changed, err = 0; /* * Each application of rule has own sequence number. @@ -339,8 +339,9 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream, * Each member of 'rstamps' array represents the sequence number of * recent application of corresponding rule. */ - for (k = 0; k < constrs->rules_num; k++) - rstamps[k] = 0; + rstamps = kcalloc(constrs->rules_num, sizeof(unsigned int), GFP_KERNEL); + if (!rstamps) + return -ENOMEM; /* * Each member of 'vstamps' array represents the sequence number of @@ -398,8 +399,10 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream, } changed = r->func(params, r); - if (changed < 0) - return changed; + if (changed < 0) { + err = changed; + goto out; + } /* * When the parameter is changed, notify it to the caller @@ -430,7 +433,9 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream, if (again) goto retry; - return 0; + out: + kfree(rstamps); + return err; } static int fixup_unreferenced_params(struct snd_pcm_substream *substream, -- 2.16.2

2 1

[alsa-devel] [PATCH] ALSA: hda: Add Icelake PCI ID
by Guneshwor Singh 13 Mar '18

13 Mar '18

Icelake is a next generation Intel platform. Add PCI ID for it. Signed-off-by: Guneshwor Singh <guneshwor.o.singh(a)intel.com> --- sound/pci/hda/hda_intel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 96143df19b21..32acab080781 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2426,6 +2426,9 @@ static const struct pci_device_id azx_ids[] = { /* Cannonlake */ { PCI_DEVICE(0x8086, 0x9dc8), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, + /* Icelake */ + { PCI_DEVICE(0x8086, 0x34c8), + .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.16.2

2 1

[alsa-devel] [PATCH v3 00/22] ASoC: rt5651: jack-detect fixes and improvements
by Hans de Goede 13 Mar '18

13 Mar '18

Hi All, Here is v3 of my rt5651 codec and Intel machine-driver series which mainly consists of various jack-detect related fixes and improvements. Changes in v3: -Drop patches of which the v2 version has been merged (Thanks Mark) -Split out dt-bindings documentation into a separate patch -Rework how we deal with the machine-driver adding properties, so that there no longer is a need for calling the ugly private rt5651_apply_properties function from the machine-driver -Split the patch for moving the configuration of the jack-detect source to device-properties into separate codec and machine-driver patches -Split the patch making the OVCD threshold-current and scale-factor configurable into 2 separate patches Changes in v2; -Get rid of platform_data and use device-properties instead -Split up a couple of the micbias / OVCD / jack-detect patches into smaller patches, as they were doing too much in a single patch -Improved commit messages -Concentrate the knowledge that SSP0 is 16 bits on BYTCR in the fixup function and extract the sample-format from the hw_params in other places Regards, Hans

3 40

[alsa-devel] [asoc:topic/twl6040 1/2] sound/soc/codecs/twl6040.c:1156:71-72: remove: first occurrence line 1158, second occurrence line 1160 (fwd)
by Julia Lawall 12 Mar '18

12 Mar '18

There are two initializations of the remove field. Both give it the same value, so one can just be dropped. julia ---------- Forwarded message ---------- Date: Tue, 13 Mar 2018 05:55:05 +0800 From: kbuild test robot <fengguang.wu(a)intel.com> To: kbuild(a)01.org Cc: Julia Lawall <julia.lawall(a)lip6.fr> Subject: [asoc:topic/twl6040 1/2] sound/soc/codecs/twl6040.c:1156:71-72: remove: first occurrence line 1158, second occurrence line 1160 CC: kbuild-all(a)01.org CC: alsa-devel(a)alsa-project.org TO: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> CC: Mark Brown <broonie(a)kernel.org> tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/twl6040 head: c9d066650cd5adf4ed4bf5734386699e765222b7 commit: 7480389fb0d873ed78619542bf5d2717a7ad7786 [1/2] ASoC: twl6040: replace codec to component :::::: branch date: 5 hours ago :::::: commit date: 4 weeks ago >> sound/soc/codecs/twl6040.c:1156:71-72: remove: first occurrence line 1158, second occurrence line 1160 # https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/commit/?i… git remote add asoc https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git git remote update asoc git checkout 7480389fb0d873ed78619542bf5d2717a7ad7786 vim +1156 sound/soc/codecs/twl6040.c 8ecbabd9 Misael Lopez Cruz 2010-03-19 1155 7480389f Kuninori Morimoto 2018-01-29 @1156 static const struct snd_soc_component_driver soc_component_dev_twl6040 = { f0fba2ad Liam Girdwood 2010-03-17 1157 .probe = twl6040_probe, f0fba2ad Liam Girdwood 2010-03-17 @1158 .remove = twl6040_remove, 8146acff Tony Lindgren 2018-01-25 1159 .read = twl6040_read, 7480389f Kuninori Morimoto 2018-01-29 @1160 .remove = twl6040_remove, f0fba2ad Liam Girdwood 2010-03-17 1161 .set_bias_level = twl6040_set_bias_level, a175fce0 Peter Ujfalusi 2011-10-11 1162 .controls = twl6040_snd_controls, a175fce0 Peter Ujfalusi 2011-10-11 1163 .num_controls = ARRAY_SIZE(twl6040_snd_controls), a175fce0 Peter Ujfalusi 2011-10-11 1164 .dapm_widgets = twl6040_dapm_widgets, a175fce0 Peter Ujfalusi 2011-10-11 1165 .num_dapm_widgets = ARRAY_SIZE(twl6040_dapm_widgets), a175fce0 Peter Ujfalusi 2011-10-11 1166 .dapm_routes = intercon, a175fce0 Peter Ujfalusi 2011-10-11 1167 .num_dapm_routes = ARRAY_SIZE(intercon), 7480389f Kuninori Morimoto 2018-01-29 1168 .suspend_bias_off = 1, 7480389f Kuninori Morimoto 2018-01-29 1169 .idle_bias_on = 1, 7480389f Kuninori Morimoto 2018-01-29 1170 .endianness = 1, 7480389f Kuninori Morimoto 2018-01-29 1171 .non_legacy_dai_naming = 1, f0fba2ad Liam Girdwood 2010-03-17 1172 }; f0fba2ad Liam Girdwood 2010-03-17 1173 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH] ASoC: sgtl5000: Pass the required '#sound-dai-cells'
by Fabio Estevam 12 Mar '18

12 Mar '18

From: Fabio Estevam <fabio.estevam(a)nxp.com> DTC now warns about missing #sound-dai-cells: arch/arm/boot/dts/imx6ul-geam.dtb: Warning (sound_dai_property): /sound/simple-audio-card,codec: Missing property '#sound-dai-cells' in node /soc/aips-bus@2100000/i2c@21a0000/codec@a or bad phandle (referred from sound-dai[0]) Pass the required '#sound-dai-cells' property to improve the documentation. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- Documentation/devicetree/bindings/sound/sgtl5000.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/sgtl5000.txt b/Documentation/devicetree/bindings/sound/sgtl5000.txt index 060cb4a..9a36c7e 100644 --- a/Documentation/devicetree/bindings/sound/sgtl5000.txt +++ b/Documentation/devicetree/bindings/sound/sgtl5000.txt @@ -5,6 +5,8 @@ Required properties: - reg : the I2C address of the device +- #sound-dai-cells: must be equal to 0 + - clocks : the clock provider of SYS_MCLK - VDDA-supply : the regulator provider of VDDA @@ -40,6 +42,7 @@ Example: codec: sgtl5000@a { compatible = "fsl,sgtl5000"; reg = <0x0a>; + #sound-dai-cells = <0>; clocks = <&clks 150>; micbias-resistor-k-ohms = <2>; micbias-voltage-m-volts = <2250>; -- 2.7.4

2 1

[alsa-devel] [PATCH 1/2] ASoC: rt5651: move definitions of dt-binding constants to include/dt-bindings
by Hans de Goede 12 Mar '18

12 Mar '18

Move the definitions of constants used in the dt-bindings from include/sound/rt5651.h to include/dt-bindings/sound/rt5651.h. As dt-bindings headers may also be parsed by the dt-compiler, they cannot use enums, only defines, so this commit also changes the code declaring the constants to use defines. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- include/dt-bindings/sound/rt5651.h | 15 +++++++++++++++ include/sound/rt5651.h | 36 ------------------------------------ sound/soc/codecs/rt5651.h | 4 ++-- 3 files changed, 17 insertions(+), 38 deletions(-) create mode 100644 include/dt-bindings/sound/rt5651.h delete mode 100644 include/sound/rt5651.h diff --git a/include/dt-bindings/sound/rt5651.h b/include/dt-bindings/sound/rt5651.h new file mode 100644 index 000000000000..2f2dac915168 --- /dev/null +++ b/include/dt-bindings/sound/rt5651.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __DT_RT5651_H +#define __DT_RT5651_H + +#define RT5651_JD_NULL 0 +#define RT5651_JD1_1 1 +#define RT5651_JD1_2 2 +#define RT5651_JD2 3 + +#define RT5651_OVCD_SF_0P5 0 +#define RT5651_OVCD_SF_0P75 1 +#define RT5651_OVCD_SF_1P0 2 +#define RT5651_OVCD_SF_1P5 3 + +#endif /* __DT_RT5651_H */ diff --git a/include/sound/rt5651.h b/include/sound/rt5651.h deleted file mode 100644 index 6403b862fb9a..000000000000 --- a/include/sound/rt5651.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * linux/sound/rt286.h -- Platform data for RT286 - * - * Copyright 2013 Realtek Microelectronics - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#ifndef __LINUX_SND_RT5651_H -#define __LINUX_SND_RT5651_H - -/* - * Note these MUST match the values from the DT binding: - * Documentation/devicetree/bindings/sound/rt5651.txt - */ -enum rt5651_jd_src { - RT5651_JD_NULL, - RT5651_JD1_1, - RT5651_JD1_2, - RT5651_JD2, -}; - -/* - * Note these MUST match the values from the DT binding: - * Documentation/devicetree/bindings/sound/rt5651.txt - */ -enum rt5651_ovcd_sf { - RT5651_OVCD_SF_0P5, - RT5651_OVCD_SF_0P75, - RT5651_OVCD_SF_1P0, - RT5651_OVCD_SF_1P5, -}; - -#endif diff --git a/sound/soc/codecs/rt5651.h b/sound/soc/codecs/rt5651.h index f20c9be94fb2..3a0968c53fde 100644 --- a/sound/soc/codecs/rt5651.h +++ b/sound/soc/codecs/rt5651.h @@ -12,7 +12,7 @@ #ifndef __RT5651_H__ #define __RT5651_H__ -#include <sound/rt5651.h> +#include <dt-bindings/sound/rt5651.h> /* Info */ #define RT5651_RESET 0x00 @@ -2073,7 +2073,7 @@ struct rt5651_priv { struct regmap *regmap; struct snd_soc_jack *hp_jack; struct work_struct jack_detect_work; - enum rt5651_jd_src jd_src; + unsigned int jd_src; unsigned int ovcd_th; unsigned int ovcd_sf; -- 2.14.3

2 3

[alsa-devel] [PATCH] ASoC: topology: create TLV data for dapm widgets
by Ranjani Sridharan 12 Mar '18

12 Mar '18

This patch adds the change required to create the TLV data for dapm widget kcontrols from topology. This also fixes the following TLV read error shown in amixer while showing the card control contents. "amixer: Control hw:1 element TLV read error: No such device or address" Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- sound/soc/soc-topology.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 293124855cf6..dc6f06e853d0 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1294,6 +1294,9 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_dmixer_create( kfree(sm); continue; } + + /* create any TLV data */ + soc_tplg_create_tlv(tplg, &kc[i], &mc->hdr); } return kc; -- 2.14.1

2 1

[alsa-devel] [PATCH 5/6] ASoC: samsung: Drop uneeded RCLKSRC setting in the Snow driver
by Sylwester Nawrocki 12 Mar '18

12 Mar '18

The SAMSUNG_I2S_RCLKSRC_0 RCLKSRC mux is a default configuration after reset so there is no need for this explicit snd_soc_dai_set_sysclk() call. Also, this static mux clock configuration can be specified in DT. Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- sound/soc/samsung/snow.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c index d8ac907bbb0d..fc62110f500f 100644 --- a/sound/soc/samsung/snow.c +++ b/sound/soc/samsung/snow.c @@ -50,11 +50,6 @@ static int snow_late_probe(struct snd_soc_card *card) if (ret < 0) return ret; - /* Select I2S Bus clock to set RCLK and BCLK */ - ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_RCLKSRC_0, - 0, SND_SOC_CLOCK_IN); - if (ret < 0) - return ret; return 0; } -- 2.14.2

2 1