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

[PATCH v3] ASoC: rt1015: add delay to fix pop noise from speaker
by jack.yu＠realtek.com 06 Nov '20

06 Nov '20

From: Jack Yu <jack.yu(a)realtek.com> Add delay to fix pop noise from speaker. Signed-off-by: Jack Yu <jack.yu(a)realtek.com> --- .../devicetree/bindings/sound/rt1015.txt | 6 ++++++ include/sound/rt1015.h | 15 ++++++++++++++ sound/soc/codecs/rt1015.c | 20 +++++++++++++++++++ sound/soc/codecs/rt1015.h | 2 ++ 4 files changed, 43 insertions(+) create mode 100644 include/sound/rt1015.h diff --git a/Documentation/devicetree/bindings/sound/rt1015.txt b/Documentation/devicetree/bindings/sound/rt1015.txt index fcfd02d8d32f..e498966d436f 100644 --- a/Documentation/devicetree/bindings/sound/rt1015.txt +++ b/Documentation/devicetree/bindings/sound/rt1015.txt @@ -8,10 +8,16 @@ Required properties: - reg : The I2C address of the device. +Optional properties: + +- realtek,power-up-delay-ms + Set a delay time for flush work to be completed, + this value is adjustable depending on platform. Example: rt1015: codec@28 { compatible = "realtek,rt1015"; reg = <0x28>; + realtek,power-up-delay-ms = <50>; }; diff --git a/include/sound/rt1015.h b/include/sound/rt1015.h new file mode 100644 index 000000000000..70a7538d4c89 --- /dev/null +++ b/include/sound/rt1015.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * linux/sound/rt1015.h -- Platform data for RT1015 + * + * Copyright 2020 Realtek Microelectronics + */ + +#ifndef __LINUX_SND_RT1015_H +#define __LINUX_SND_RT1015_H + +struct rt1015_platform_data { + unsigned int power_up_delay_ms; +}; + +#endif diff --git a/sound/soc/codecs/rt1015.c b/sound/soc/codecs/rt1015.c index 25fe2ddedd54..967193518349 100644 --- a/sound/soc/codecs/rt1015.c +++ b/sound/soc/codecs/rt1015.c @@ -27,10 +27,15 @@ #include <sound/soc-dapm.h> #include <sound/soc.h> #include <sound/tlv.h> +#include <sound/rt1015.h> #include "rl6231.h" #include "rt1015.h" +static const struct rt1015_platform_data i2s_default_platform_data = { + .power_up_delay_ms = 50, +}; + static const struct reg_default rt1015_reg[] = { { 0x0000, 0x0000 }, { 0x0004, 0xa000 }, @@ -650,6 +655,7 @@ static int rt1015_amp_drv_event(struct snd_soc_dapm_widget *w, case SND_SOC_DAPM_POST_PMU: if (rt1015->hw_config == RT1015_HW_28) schedule_delayed_work(&rt1015->flush_work, msecs_to_jiffies(10)); + msleep(rt1015->pdata.power_up_delay_ms); break; default: break; @@ -1067,9 +1073,16 @@ static struct acpi_device_id rt1015_acpi_match[] = { MODULE_DEVICE_TABLE(acpi, rt1015_acpi_match); #endif +static void rt1015_parse_dt(struct rt1015_priv *rt1015, struct device *dev) +{ + device_property_read_u32(dev, "realtek,power-up-delay-ms", + &rt1015->pdata.power_up_delay_ms); +} + static int rt1015_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { + struct rt1015_platform_data *pdata = dev_get_platdata(&i2c->dev); struct rt1015_priv *rt1015; int ret; unsigned int val; @@ -1081,6 +1094,13 @@ static int rt1015_i2c_probe(struct i2c_client *i2c, i2c_set_clientdata(i2c, rt1015); + rt1015->pdata = i2s_default_platform_data; + + if (pdata) + rt1015->pdata = *pdata; + else + rt1015_parse_dt(rt1015, &i2c->dev); + rt1015->regmap = devm_regmap_init_i2c(i2c, &rt1015_regmap); if (IS_ERR(rt1015->regmap)) { ret = PTR_ERR(rt1015->regmap); diff --git a/sound/soc/codecs/rt1015.h b/sound/soc/codecs/rt1015.h index d3fdd30aca6d..15cadb361ec3 100644 --- a/sound/soc/codecs/rt1015.h +++ b/sound/soc/codecs/rt1015.h @@ -12,6 +12,7 @@ #ifndef __RT1015_H__ #define __RT1015_H__ +#include <sound/rt1015.h> #define RT1015_DEVICE_ID_VAL 0x1011 #define RT1015_DEVICE_ID_VAL2 0x1015 @@ -380,6 +381,7 @@ enum { struct rt1015_priv { struct snd_soc_component *component; + struct rt1015_platform_data pdata; struct regmap *regmap; int sysclk; int sysclk_src; -- 2.28.0

3 2

[PATCH v6 0/3] ASoC: dt-bindings: audio-graph-card: switch to yaml base Documentation
by Kuninori Morimoto 06 Nov '20

06 Nov '20

Hi Rob, Mark Cc: Sameer These are v6 of switch to yaml base Documentation for audio-graph-card and renesas,rsnd which uses audio-graph-card. v5 -> v6 - add Acked-by/Reviewed-by on each patch - remove "audio-graph-card,xxx" property - remove un-needed if "ok" v4 -> v5 - move "endpoint" under "port" v3 -> v4 - fixuped yamllint warnings/errors v2 -> v3 - fixuped Rob's pointed points v1 -> v2 - upgrade dt-schema, and fixup errors for [2/2] patch Kuninori Morimoto (3): dt-bindings: ASoC: audio-graph-card: switch to yaml base Documentation dt-bindings: ASoC: renesas,rsnd: switch to yaml base Documentation dt-bindings: ASoC: renesas,rsnd: Add r8a77961 support .../bindings/sound/audio-graph-card.txt | 337 ------------ .../bindings/sound/audio-graph-card.yaml | 153 ++++++ .../bindings/sound/renesas,rsnd.txt | 520 ------------------ .../bindings/sound/renesas,rsnd.yaml | 451 +++++++++++++++ 4 files changed, 604 insertions(+), 857 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card.txt create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card.yaml create mode 100644 Documentation/devicetree/bindings/sound/renesas,rsnd.yaml -- 2.25.1

3 5

[PATCH mlx5-next v1 00/11] Convert mlx5 to use auxiliary bus
by Leon Romanovsky 06 Nov '20

06 Nov '20

From: Leon Romanovsky <leonro(a)nvidia.com> Changelog: v1: * Renamed _mlx5_rescan_driver to be mlx5_rescan_driver_locked like in other parts of the mlx5 driver. * Renamed MLX5_INTERFACE_PROTOCOL_VDPA to tbe MLX5_INTERFACE_PROTOCOL_VNET as a preparation to coming series from Eli C. * Some small naming renames in mlx5_vdpa. * Refactored adev index code to make Parav's SF series to apply more easily. * Fixed devlink reload bug that caused to lost TCP connection. v0: https://lore.kernel.org/lkml/20201026111849.1035786-1-leon@kernel.org/ -------------------------------------------------------------- Hi, This patch set converts mlx5 driver to use auxiliary bus [1]. In this series, we are connecting three subsystems (VDPA, netdev and RDMA) through mlx5_core PCI driver. That driver is responsible to create proper devices based on supported firmware. First four patches are preparitions and fixes that were spotted during code development, rest is the conversion itself. Thanks [1] https://lore.kernel.org/lkml/20201023003338.1285642-1-david.m.ertman@intel.… Leon Romanovsky (11): net/mlx5: Don't skip vport check net/mlx5: Properly convey driver version to firmware net/mlx5_core: Clean driver version and name vdpa/mlx5: Make hardware definitions visible to all mlx5 devices net/mlx5: Register mlx5 devices to auxiliary virtual bus vdpa/mlx5: Connect mlx5_vdpa to auxiliary bus net/mlx5e: Connect ethernet part to auxiliary bus RDMA/mlx5: Convert mlx5_ib to use auxiliary bus net/mlx5: Delete custom device management logic net/mlx5: Simplify eswitch mode check RDMA/mlx5: Remove IB representors dead code drivers/infiniband/hw/mlx5/counters.c | 7 - drivers/infiniband/hw/mlx5/ib_rep.c | 113 ++-- drivers/infiniband/hw/mlx5/ib_rep.h | 45 +- drivers/infiniband/hw/mlx5/main.c | 148 +++-- drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 +- .../net/ethernet/mellanox/mlx5/core/Kconfig | 1 + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 567 ++++++++++++------ .../net/ethernet/mellanox/mlx5/core/devlink.c | 4 +- .../ethernet/mellanox/mlx5/core/en_ethtool.c | 4 +- .../net/ethernet/mellanox/mlx5/core/en_main.c | 135 ++--- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 42 +- .../net/ethernet/mellanox/mlx5/core/en_rep.h | 6 +- .../net/ethernet/mellanox/mlx5/core/en_tc.c | 8 +- .../mellanox/mlx5/core/esw/devlink_port.c | 2 +- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 28 +- .../mellanox/mlx5/core/eswitch_offloads.c | 6 + .../mellanox/mlx5/core/ipoib/ethtool.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 58 +- .../net/ethernet/mellanox/mlx5/core/main.c | 50 +- .../ethernet/mellanox/mlx5/core/mlx5_core.h | 33 +- drivers/vdpa/mlx5/Makefile | 2 +- drivers/vdpa/mlx5/net/main.c | 76 --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 53 +- drivers/vdpa/mlx5/net/mlx5_vnet.h | 24 - include/linux/mlx5/driver.h | 34 +- include/linux/mlx5/eswitch.h | 8 +- .../linux/mlx5/mlx5_ifc_vdpa.h | 6 +- 27 files changed, 818 insertions(+), 648 deletions(-) delete mode 100644 drivers/vdpa/mlx5/net/main.c delete mode 100644 drivers/vdpa/mlx5/net/mlx5_vnet.h rename drivers/vdpa/mlx5/core/mlx5_vdpa_ifc.h => include/linux/mlx5/mlx5_ifc_vdpa.h (97%) -- 2.28.0

8 28

[PATCH v5 0/2] Modify documentation and machine driver for SC7180 sound card
by Ajye Huang 06 Nov '20

06 Nov '20

Note: - The patch is made by the collaboration of Ajye Huang <ajye_huang(a)compal.corp-partner.google.com> Cheng-Yi Chiang <cychiang(a)chromium.org> v5: - Machine driver: - Fix a format string warning (Reported-by: kernel test robot <lkp(a)intel.com>). detailed info at https://lore.kernel.org/patchwork/patch/1331087/ v4: - Machine driver: Addressed suggestions from Tzung-Bi. - Remove redundant judgments in dmic_set() and dmic_get(). - Remove 1 level indent of judgment of IS_ERR(data->dmic_sel). v3: - Machine driver: Addressed suggestions from Tzung-Bi. - move variables "dmic_switch" and "dmic_sel" into struct sc7180_snd_data. - Remove redundant judgments in dmic_set(). v2: - Documentation: Modify the dimc-gpios property description and examples. - Machine driver: - Remove "qcom,sc7180-sndcard-rt5682-m98357-2mic" compatible - See gpio property and use anadditional control. Thanks for the review! Ajye Huang (2): ASoC: google: dt-bindings: modify machine bindings for two MICs case ASoC: qcom: sc7180: Modify machine driver for 2mic .../bindings/sound/google,sc7180-trogdor.yaml | 58 ++++++++++++++++++ sound/soc/qcom/sc7180.c | 61 +++++++++++++++++++ 2 files changed, 119 insertions(+) -- 2.25.1

3 5

[PATCH AUTOSEL 5.9 039/147] ASoC: SOF: fix a runtime pm issue in SOF when HDMI codec doesn't work
by Sasha Levin 05 Nov '20

05 Nov '20

From: Rander Wang <rander.wang(a)intel.com> [ Upstream commit 6c63c954e1c52f1262f986f36d95f557c6f8fa94 ] When hda_codec_probe() doesn't initialize audio component, we disable the codec and keep going. However,the resources are not released. The child_count of SOF device is increased in snd_hdac_ext_bus_device_init but is not decrease in error case, so SOF can't get suspended. snd_hdac_ext_bus_device_exit will be invoked in HDA framework if it gets a error. Now copy this behavior to release resources and decrease SOF device child_count to release SOF device. Signed-off-by: Rander Wang <rander.wang(a)intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Link: https://lore.kernel.org/r/20200825235040.1586478-3-ranjani.sridharan@linux.… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/intel/hda-codec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c index 2c5c451fa19d7..c475955c6eeba 100644 --- a/sound/soc/sof/intel/hda-codec.c +++ b/sound/soc/sof/intel/hda-codec.c @@ -151,7 +151,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, if (!hdev->bus->audio_component) { dev_dbg(sdev->dev, "iDisp hw present but no driver\n"); - return -ENOENT; + goto error; } hda_priv->need_display_power = true; } @@ -174,7 +174,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, * other return codes without modification */ if (ret == 0) - ret = -ENOENT; + goto error; } return ret; -- 2.25.1

3 3

[GIT PULL] ASoC fixes for v5.10-rc2
by Mark Brown 05 Nov '20

05 Nov '20

The following changes since commit 3650b228f83adda7e5ee532e2b90429c03f7b9ec: Linux 5.10-rc1 (2020-10-25 15:14:11 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.10-rc2 for you to fetch changes up to f9d7c6eb23f7e55e7a0ca5451da06909bdfdd0e4: ASoC: mchp-spdiftx: Do not set Validity bit(s) (2020-11-04 17:50:22 +0000) ---------------------------------------------------------------- ASoC: Fixes for v5.10 A batch of driver specific fixes that have come up since the merge window, nothing particularly major here but all good to have. ---------------------------------------------------------------- Bard Liao (1): ASoC: SOF: loader: handle all SOF_IPC_EXT types Cezary Rojewski (3): ASoC: Intel: atom: Remove duplicate kconfigs ASoC: Intel: catpt: Wake up device before configuring SSP port ASoC: Intel: catpt: Relax clock selection conditions Codrin Ciubotariu (1): ASoC: mchp-spdiftx: Do not set Validity bit(s) Mark Brown (1): Merge tag 'v5.10-rc1' into asoc-5.10 Olivier Moysan (1): ASoC: cs42l51: manage mclk shutdown delay Srinivas Kandagatla (4): ASoC: codecs: wsa881x: add missing stream rates and format ASoC: qcom: sdm845: set driver name correctly ASoC: codecs: wcd934x: Set digital gain range correctly ASoC: codecs: wcd9335: Set digital gain range correctly Tomasz Figa (1): ASoC: Intel: kbl_rt5663_max98927: Fix kabylake_ssp_fixup function Tzung-Bi Shih (1): ASoC: mediatek: mt8183-da7219: fix DAPM paths for rt1015 V Sujith Kumar Reddy (2): ASoC: qcom: lpass-sc7180: Fix MI2S bitwidth field bit positions ASoC: qcom: lpass-cpu: Fix clock disable failure sound/soc/atmel/mchp-spdiftx.c | 1 - sound/soc/codecs/cs42l51.c | 22 +++++++++++- sound/soc/codecs/wcd9335.c | 2 +- sound/soc/codecs/wcd934x.c | 2 +- sound/soc/codecs/wsa881x.c | 2 ++ sound/soc/intel/Kconfig | 18 ---------- sound/soc/intel/atom/Makefile | 2 +- sound/soc/intel/atom/sst/Makefile | 6 ++-- sound/soc/intel/boards/kbl_rt5663_max98927.c | 39 +++++++++++++++++----- sound/soc/intel/catpt/dsp.c | 9 +++-- sound/soc/intel/catpt/pcm.c | 10 ++++++ sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 31 +++++++++++++---- sound/soc/qcom/lpass-cpu.c | 14 +++++--- sound/soc/qcom/lpass-sc7180.c | 2 +- sound/soc/qcom/sdm845.c | 2 ++ sound/soc/sof/loader.c | 5 +++ 16 files changed, 119 insertions(+), 48 deletions(-)

2 1

[PATCH] ASoC: q6afe-clocks: fix warning on symbol scope
by Srinivas Kandagatla 05 Nov '20

05 Nov '20

This patch fixes below warning when module is compiled with W=1 C=1 sound/soc/qcom/qdsp6/q6afe-clocks.c:122:18: warning: symbol 'q6afe_clks' was not declared. Should it be static? Fixes: 520a1c396d196 ("ASoC: q6afe-clocks: add q6afe clock controller") Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/qcom/qdsp6/q6afe-clocks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/qcom/qdsp6/q6afe-clocks.c b/sound/soc/qcom/qdsp6/q6afe-clocks.c index 2efc2eaa0424..87e4633afe2c 100644 --- a/sound/soc/qcom/qdsp6/q6afe-clocks.c +++ b/sound/soc/qcom/qdsp6/q6afe-clocks.c @@ -119,7 +119,7 @@ static const struct clk_ops clk_vote_q6afe_ops = { .unprepare = clk_unvote_q6afe_block, }; -struct q6afe_clk *q6afe_clks[Q6AFE_MAX_CLK_ID] = { +static struct q6afe_clk *q6afe_clks[Q6AFE_MAX_CLK_ID] = { [LPASS_CLK_ID_PRI_MI2S_IBIT] = Q6AFE_CLK(LPASS_CLK_ID_PRI_MI2S_IBIT), [LPASS_CLK_ID_PRI_MI2S_EBIT] = Q6AFE_CLK(LPASS_CLK_ID_PRI_MI2S_EBIT), [LPASS_CLK_ID_SEC_MI2S_IBIT] = Q6AFE_CLK(LPASS_CLK_ID_SEC_MI2S_IBIT), -- 2.21.0

2 1

[PATCH] ASoc: qcom: lpass-cpu: fix warning on symbol scope
by Srinivas Kandagatla 05 Nov '20

05 Nov '20

This patch fixes below warning when module is compiled with W=1 C=1 lpass-cpu.c:677:22: warning: symbol 'lpass_hdmi_regmap_config' was not declared. Should it be static? Fixes: 7cb37b7bd0d3 ("ASoC: qcom: Add support for lpass hdmi driver") Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/qcom/lpass-cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 9d17c87445a9..1fd862e3fd8a 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -674,7 +674,7 @@ static bool lpass_hdmi_regmap_volatile(struct device *dev, unsigned int reg) return false; } -struct regmap_config lpass_hdmi_regmap_config = { +static struct regmap_config lpass_hdmi_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, -- 2.21.0

2 1

[PATCH] ASoC: samsung: i2s: Remove redundant null check before clk_disable_unprepare
by Xu Wang 05 Nov '20

05 Nov '20

Because clk_disable_unprepare() already checked NULL clock parameter, so the additional check is unnecessary, just remove it. Signed-off-by: Xu Wang <vulab(a)iscas.ac.cn> --- sound/soc/samsung/i2s.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index df53d4ea808f..36969f0a3f9a 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1212,8 +1212,7 @@ static int i2s_runtime_suspend(struct device *dev) priv->suspend_i2scon = readl(priv->addr + I2SCON); priv->suspend_i2spsr = readl(priv->addr + I2SPSR); - if (priv->op_clk) - clk_disable_unprepare(priv->op_clk); + clk_disable_unprepare(priv->op_clk); clk_disable_unprepare(priv->clk); return 0; -- 2.17.1

2 1

[PATCH] ASoC: pcm: DRAIN support reactivation
by Cezary Rojewski 05 Nov '20

05 Nov '20

soc-pcm's dpcm_fe_dai_do_trigger() supported DRAIN commnad up to kernel v5.4 where explicit switch(cmd) has been introduced which takes into account all SNDRV_PCM_TRIGGER_xxx but SNDRV_PCM_TRIGGER_DRAIN. Update switch statement to reactive support for it. As DRAIN is somewhat unique by lacking negative/stop counterpart, bring behaviour of dpcm_fe_dai_do_trigger() for said command back to its pre-v5.4 state by adding it to START/RESUME/PAUSE_RELEASE group. Fixes: acbf27746ecf ("ASoC: pcm: update FE/BE trigger order based on the command") Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> --- sound/soc/soc-pcm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index dcab9527ba3d..91bf33958159 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2231,6 +2231,7 @@ static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd) case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + case SNDRV_PCM_TRIGGER_DRAIN: ret = dpcm_dai_trigger_fe_be(substream, cmd, true); break; case SNDRV_PCM_TRIGGER_STOP: @@ -2248,6 +2249,7 @@ static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd) case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + case SNDRV_PCM_TRIGGER_DRAIN: ret = dpcm_dai_trigger_fe_be(substream, cmd, false); break; case SNDRV_PCM_TRIGGER_STOP: -- 2.17.1

3 2