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

[alsa-devel] [PATCH -next] ASoC: rt700: remove unused including <linux/version.h>
by YueHaibing 14 Jan '20

14 Jan '20

Remove including <linux/version.h> that don't need it. Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/codecs/rt700.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/rt700.c b/sound/soc/codecs/rt700.c index b1830c1ebf8a..ff68f0e4f629 100644 --- a/sound/soc/codecs/rt700.c +++ b/sound/soc/codecs/rt700.c @@ -8,7 +8,6 @@ #include <linux/module.h> #include <linux/moduleparam.h> -#include <linux/version.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/delay.h>

2 1

[alsa-devel] [PATCH] ASoC: rt715: use dev_to_sdw_dev() instead of to_sdw_slave_device()
by Kuninori Morimoto 14 Jan '20

14 Jan '20

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> This patch fixup this error CC sound/soc/codecs/rt715-sdw.o linux/sound/soc/codecs/rt715-sdw.c: In function 'rt715_dev_resume': linux/sound/soc/codecs/rt715-sdw.c:568:28: error: implicit declaration\ of function 'to_sdw_slave_device'; did you mean 'sdw_slave_modalias'?\ [-Werror=implicit-function-declaration] struct sdw_slave *slave = to_sdw_slave_device(dev); ^~~~~~~~~~~~~~~~~~~ sdw_slave_modalias linux/sound/soc/codecs/rt715-sdw.c:568:28: warning: initialization of\ 'struct sdw_slave *' from 'int' makes pointer from integer without a\ cast [-Wint-conversion] cc1: some warnings being treated as errors Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/codecs/rt715-sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt715-sdw.c b/sound/soc/codecs/rt715-sdw.c index c35591f..18868e4 100644 --- a/sound/soc/codecs/rt715-sdw.c +++ b/sound/soc/codecs/rt715-sdw.c @@ -565,7 +565,7 @@ static int rt715_dev_suspend(struct device *dev) static int rt715_dev_resume(struct device *dev) { - struct sdw_slave *slave = to_sdw_slave_device(dev); + struct sdw_slave *slave = dev_to_sdw_dev(dev); struct rt715_priv *rt715 = dev_get_drvdata(dev); unsigned long time; -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: rt715: remove warnings
by Pierre-Louis Bossart 14 Jan '20

14 Jan '20

make W=1 reports defined-but-not-used and kernel-doc formatting issues. No functionality change. Fixes: d1ede0641b05e4 ("ASoC: rt715: add RT715 codec driver") Cc: Jack Yu <jack.yu(a)realtek.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/codecs/rt715.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c index 5c6f05b8d8ab..4c746938a062 100644 --- a/sound/soc/codecs/rt715.c +++ b/sound/soc/codecs/rt715.c @@ -203,7 +203,6 @@ static int rt715_set_amp_gain_get(struct snd_kcontrol *kcontrol, return 0; } -static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -6525, 75, 0); static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -1725, 75, 0); static const DECLARE_TLV_DB_SCALE(mic_vol_tlv, 0, 1000, 0); @@ -366,7 +365,7 @@ static const char * const adc_22_23_mux_text[] = { "DMIC4", }; -/** +/* * Due to mux design for nid 24 (MUX_IN3)/25 (MUX_IN4), connection index 0 and * 1 will be connected to the same dmic source, therefore we skip index 1 to * avoid misunderstanding on usage of dapm routing. @@ -404,6 +403,7 @@ static SOC_ENUM_SINGLE_DECL( static SOC_VALUE_ENUM_SINGLE_DECL(rt715_adc24_enum, RT715_MUX_IN3, 0, 0xf, adc_24_mux_text, rt715_adc_24_25_values); + static SOC_VALUE_ENUM_SINGLE_DECL(rt715_adc25_enum, RT715_MUX_IN4, 0, 0xf, adc_25_mux_text, rt715_adc_24_25_values); -- 2.20.1

2 1

[alsa-devel] [PATCH 00/18] ASoC: Intel: remove compilation/static analysis warnings
by Pierre-Louis Bossart 14 Jan '20

14 Jan '20

More trivial fixes for Intel machine drivers in my quixotic quest for zero warnings. None of them are critical but they generate noise that prevents developers from using those tools to detect real issues. Pierre-Louis Bossart (18): ASoC: Intel: bxt_da7219_max98357a: rename shadowed variable ASoC: Intel: bxt_rt298: rename shadowed variable ASoC: Intel: glk_rt5682_max98357a: rename shadowed variable ASoC: Intel: glk_rt5682_max98357a: removed unused variables ASoC: Intel: kbl_da7219_max98357a: rename shadowed variable ASoC: Intel: kbl_da7219_max98927: test return value on route add ASoC: Intel: kbl_da7219_max98927: rename shadowed variable ASoC: Intel: kbl_da7219_max98927: remove unnecessary initialization ASoC: Intel: kbl_rt5660: rename shadowed variable ASoC: Intel: kbl_rt5663_max98927: rename shadowed variable ASoC: Intel: kbl_rt5663_rt5514_max98927: rename shadowed variable ASOC: Intel: kbl_rt5663_rt5514_max98927: remove useless initialization ASoC: Intel: skl_nau88l25_max98357a: rename shadowed variable ASoC: Intel: skl_nau88l25_ssm4567: rename shadowed variable ASoC: Intel: skl_rt286: rename shadowed variable ASoC: Intel: bytcht_es8316: removed unused variable ASoC: Intel: bytcr_rt5640: remove unused variable ASoC: Intel: bytcr_rt5651: remove unused variable sound/soc/intel/boards/bxt_da7219_max98357a.c | 10 +++++----- sound/soc/intel/boards/bxt_rt298.c | 8 ++++---- sound/soc/intel/boards/bytcht_es8316.c | 8 -------- sound/soc/intel/boards/bytcr_rt5640.c | 8 -------- sound/soc/intel/boards/bytcr_rt5651.c | 8 -------- sound/soc/intel/boards/glk_rt5682_max98357a.c | 18 ++++-------------- sound/soc/intel/boards/kbl_da7219_max98357a.c | 10 +++++----- sound/soc/intel/boards/kbl_da7219_max98927.c | 19 +++++++++++-------- sound/soc/intel/boards/kbl_rt5660.c | 4 ++-- sound/soc/intel/boards/kbl_rt5663_max98927.c | 10 +++++----- .../intel/boards/kbl_rt5663_rt5514_max98927.c | 10 +++++----- .../soc/intel/boards/skl_nau88l25_max98357a.c | 10 +++++----- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 10 +++++----- sound/soc/intel/boards/skl_rt286.c | 10 +++++----- 14 files changed, 56 insertions(+), 87 deletions(-) -- 2.20.1

2 36

[alsa-devel] [PATCH] ASoC: SOF: Intel: hda-dai: fix compilation warning in pcm_prepare
by Pierre-Louis Bossart 14 Jan '20

14 Jan '20

Fix GCC warning with W=1, previous cleanup did not remove unnecessary variable. sound/soc/sof/intel/hda-dai.c: In function ‘hda_link_pcm_prepare’: sound/soc/sof/intel/hda-dai.c:265:31: warning: variable ‘hda_stream’ set but not used [-Wunused-but-set-variable] 265 | struct sof_intel_hda_stream *hda_stream; | ^~~~~~~~~~ Fixes: a3ebccb52efdf ("ASoC: SOF: Intel: hda: reset link DMA state in prepare") Cc: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/intel/hda-dai.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c index 313611dcb5e4..9c6e3f990ee3 100644 --- a/sound/soc/sof/intel/hda-dai.c +++ b/sound/soc/sof/intel/hda-dai.c @@ -262,14 +262,11 @@ static int hda_link_pcm_prepare(struct snd_pcm_substream *substream, { struct hdac_ext_stream *link_dev = snd_soc_dai_get_dma_data(dai, substream); - struct sof_intel_hda_stream *hda_stream; struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(dai->component); struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); int stream = substream->stream; - hda_stream = hstream_to_sof_hda_stream(link_dev); - if (link_dev->link_prepared) return 0; -- 2.20.1

2 1

[alsa-devel] [PATCH] ASoC: Intel: bytcr_rt5651: switch to using devm_fwnode_gpiod_get()
by Dmitry Torokhov 14 Jan '20

14 Jan '20

devm_fwnode_get_index_gpiod_from_child() is going away as the name is too unwieldy, let's switch to using the new devm_fwnode_gpiod_get(). Signed-off-by: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> --- sound/soc/intel/boards/bytcr_rt5651.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index c0d322a859f71..4495834e37653 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -998,10 +998,11 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) if (byt_rt5651_gpios) { devm_acpi_dev_add_driver_gpios(codec_dev, byt_rt5651_gpios); - priv->ext_amp_gpio = devm_fwnode_get_index_gpiod_from_child( - &pdev->dev, "ext-amp-enable", 0, - codec_dev->fwnode, - GPIOD_OUT_LOW, "speaker-amp"); + priv->ext_amp_gpio = devm_fwnode_gpiod_get(&pdev->dev, + codec_dev->fwnode, + "ext-amp-enable", + GPIOD_OUT_LOW, + "speaker-amp"); if (IS_ERR(priv->ext_amp_gpio)) { ret_val = PTR_ERR(priv->ext_amp_gpio); switch (ret_val) { @@ -1017,10 +1018,11 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) return ret_val; } } - priv->hp_detect = devm_fwnode_get_index_gpiod_from_child( - &pdev->dev, "hp-detect", 0, - codec_dev->fwnode, - GPIOD_IN, "hp-detect"); + priv->hp_detect = devm_fwnode_gpiod_get(&pdev->dev, + codec_dev->fwnode, + "hp-detect", + GPIOD_IN, + "hp-detect"); if (IS_ERR(priv->hp_detect)) { ret_val = PTR_ERR(priv->hp_detect); switch (ret_val) { -- 2.24.1.735.g03f4e72817-goog -- Dmitry

2 1

[alsa-devel] [PATCH 1/2] dt-bindings: sound: Convert jz47*-codec doc to YAML
by Paul Cercueil 14 Jan '20

14 Jan '20

Convert ingenic,jz4740-codec.txt and ingenic,jz4725b-codec.txt to one single ingenic,codec.yaml file, since they share the same binding. Add the ingenic,jz4770-codec compatible string in the process. Signed-off-by: Paul Cercueil <paul(a)crapouillou.net> --- .../bindings/sound/ingenic,codec.yaml | 55 +++++++++++++++++++ .../bindings/sound/ingenic,jz4725b-codec.txt | 20 ------- .../bindings/sound/ingenic,jz4740-codec.txt | 20 ------- 3 files changed, 55 insertions(+), 40 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/ingenic,codec.yaml delete mode 100644 Documentation/devicetree/bindings/sound/ingenic,jz4725b-codec.txt delete mode 100644 Documentation/devicetree/bindings/sound/ingenic,jz4740-codec.txt diff --git a/Documentation/devicetree/bindings/sound/ingenic,codec.yaml b/Documentation/devicetree/bindings/sound/ingenic,codec.yaml new file mode 100644 index 000000000000..eb4be86464bb --- /dev/null +++ b/Documentation/devicetree/bindings/sound/ingenic,codec.yaml @@ -0,0 +1,55 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/ingenic,codec.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Ingenic JZ47xx internal codec DT bindings + +maintainers: + - Paul Cercueil <paul(a)crapouillou.net> + +properties: + $nodename: + pattern: '^audio-codec@.*' + + compatible: + oneOf: + - const: ingenic,jz4770-codec + - const: ingenic,jz4725b-codec + - const: ingenic,jz4740-codec + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + items: + - const: aic + + '#sound-dai-cells': + const: 0 + +additionalProperties: false + +required: + - compatible + - reg + - clocks + - clock-names + - '#sound-dai-cells' + +examples: + - | + #include <dt-bindings/clock/jz4740-cgu.h> + codec: audio-codec@10020080 { + compatible = "ingenic,jz4740-codec"; + reg = <0x10020080 0x8>; + #sound-dai-cells = <0>; + clocks = <&cgu JZ4740_CLK_AIC>; + clock-names = "aic"; + }; + +... diff --git a/Documentation/devicetree/bindings/sound/ingenic,jz4725b-codec.txt b/Documentation/devicetree/bindings/sound/ingenic,jz4725b-codec.txt deleted file mode 100644 index 05adc0d47b13..000000000000 --- a/Documentation/devicetree/bindings/sound/ingenic,jz4725b-codec.txt +++ /dev/null @@ -1,20 +0,0 @@ -Ingenic JZ4725B codec controller - -Required properties: -- compatible : "ingenic,jz4725b-codec" -- reg : codec registers location and length -- clocks : phandle to the AIC clock. -- clock-names: must be set to "aic". -- #sound-dai-cells: Must be set to 0. - -Example: - -codec: audio-codec@100200a4 { - compatible = "ingenic,jz4725b-codec"; - reg = <0x100200a4 0x8>; - - #sound-dai-cells = <0>; - - clocks = <&cgu JZ4725B_CLK_AIC>; - clock-names = "aic"; -}; diff --git a/Documentation/devicetree/bindings/sound/ingenic,jz4740-codec.txt b/Documentation/devicetree/bindings/sound/ingenic,jz4740-codec.txt deleted file mode 100644 index 1ffcade87e7b..000000000000 --- a/Documentation/devicetree/bindings/sound/ingenic,jz4740-codec.txt +++ /dev/null @@ -1,20 +0,0 @@ -Ingenic JZ4740 codec controller - -Required properties: -- compatible : "ingenic,jz4740-codec" -- reg : codec registers location and length -- clocks : phandle to the AIC clock. -- clock-names: must be set to "aic". -- #sound-dai-cells: Must be set to 0. - -Example: - -codec: audio-codec@10020080 { - compatible = "ingenic,jz4740-codec"; - reg = <0x10020080 0x8>; - - #sound-dai-cells = <0>; - - clocks = <&cgu JZ4740_CLK_AIC>; - clock-names = "aic"; -}; -- 2.24.0

3 4

[alsa-devel] [PATCH v5 1/2] ASoC: dt-bindings: fsl_asrc: add compatible string for imx8qm & imx8qxp
by Shengjiu Wang 14 Jan '20

14 Jan '20

Add compatible string "fsl,imx8qm-asrc" for imx8qm platform, "fsl,imx8qxp-asrc" for imx8qxp platform. There are two asrc modules in imx8qm & imx8qxp, the clock mapping is different for each other, so add new property "fsl,asrc-clk-map" to distinguish them. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- changes in v2 -none changes in v3 -use only one compatible string "fsl,imx8qm-asrc", -add new property "fsl,asrc-clk-map". changes in v4 -add "fsl,imx8qxp-asrc" changes in v5 -refine the comments for compatible Documentation/devicetree/bindings/sound/fsl,asrc.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/fsl,asrc.txt b/Documentation/devicetree/bindings/sound/fsl,asrc.txt index 1d4d9f938689..cb9a25165503 100644 --- a/Documentation/devicetree/bindings/sound/fsl,asrc.txt +++ b/Documentation/devicetree/bindings/sound/fsl,asrc.txt @@ -8,7 +8,12 @@ three substreams within totally 10 channels. Required properties: - - compatible : Contains "fsl,imx35-asrc" or "fsl,imx53-asrc". + - compatible : Compatible list, should contain one of the following + compatibles: + "fsl,imx35-asrc", + "fsl,imx53-asrc", + "fsl,imx8qm-asrc", + "fsl,imx8qxp-asrc", - reg : Offset and length of the register set for the device. @@ -35,6 +40,11 @@ Required properties: - fsl,asrc-width : Defines a mutual sample width used by DPCM Back Ends. + - fsl,asrc-clk-map : Defines clock map used in driver. which is required + by imx8qm/imx8qxp platform + <0> - select the map for asrc0 in imx8qm/imx8qxp + <1> - select the map for asrc1 in imx8qm/imx8qxp + Optional properties: - big-endian : If this property is absent, the little endian mode -- 2.21.0

3 4

[alsa-devel] [PATCH] ASoC: rt715: use dev_to_sdw_dev() macro
by Pierre-Louis Bossart 14 Jan '20

14 Jan '20

The driver used a macro which was renamed during the joint Intel/SoundWire development, but since those renames were not merged by the SoundWire maintainer we have to revert to the original macros as done with the other Realtek codecs. Fixes: d1ede0641b05e4 ("ASoC: rt715: add RT715 codec driver") Cc: Jack Yu <jack.yu(a)realtek.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/codecs/rt715-sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt715-sdw.c b/sound/soc/codecs/rt715-sdw.c index c35591fd281b..18868e4ae6e8 100644 --- a/sound/soc/codecs/rt715-sdw.c +++ b/sound/soc/codecs/rt715-sdw.c @@ -565,7 +565,7 @@ static int rt715_dev_suspend(struct device *dev) static int rt715_dev_resume(struct device *dev) { - struct sdw_slave *slave = to_sdw_slave_device(dev); + struct sdw_slave *slave = dev_to_sdw_dev(dev); struct rt715_priv *rt715 = dev_get_drvdata(dev); unsigned long time; -- 2.20.1

2 1

[alsa-devel] [PATCH 00/16] ASoC: remove DAI suspend/resume
by Kuninori Morimoto 14 Jan '20

14 Jan '20

Hi Mark Now, ALSA SoC calls 2 type of suspend/resume suspend/resume for Component suspend/resume for DAI When ALSA SoC calls suspend/resume, its orders are 1) Suspend/Resume all CPU DAI if bus-control was 0 2) Suspend/Resume all Component 3) Suspend/Resume all CPU DAI if bus-control was 1 Historically 2)'s "Component" was "Codec", before. In total, CPU has 3 chance to suspend/resume(= 1/2/3), but Codec has 1 chance to suspend/resume(= 2). And now, no driver which is supporting suspend/resume has bus-control. This means 3) is never used. Almost all drivers which is using DAI suspend/resume can simply switch to Component suspend/resume. Few drivers want to use/keep DAI, but, we can call all DAI from Component by using this if needed for_each_component_dais() These patches switches all DAI's suspend/resume to Component one, and removes it. Kuninori Morimoto (16): ASoC: atmel: atmel_ssc_dai: move .suspend/.resume to component ASoC: bcm: cygnus-ssp: move .suspend/.resume to component ASoC: cirrus: ep93xx-i2s: move .suspend/.resume to component ASoC: jz4740: jz4740-i2s: move .suspend/.resume to component ASoC: mediatek: move .suspend/.resume to component ASoC: samsung: s3c24xx-i2s: move .suspend/.resume to component ASoC: samsung: spdif: move .suspend/.resume to component ASoC: sti: sti_uniperif: move .suspend/.resume to component ASoC: ti: omap-mcpdm: move .suspend/.resume to component ASoC: uniphier: move .suspend/.resume to component ASoC: dwc: dwc-i2s: move .suspend/.resume to component ASoC: samsung: i2s: move .suspend/.resume to component ASoC: ux500: ux500_msp_dai: remove unused DAI .suspend/.resume ASoC: pxa: pxa-ssp: move .suspend/.resume to component ASoC: pxa: pxa2xx-i2s: move .suspend/.resume to component ASoC: soc-core: remove DAI suspend/resume include/sound/soc-dai.h | 2 -- sound/soc/atmel/atmel_ssc_dai.c | 18 ++++++------- sound/soc/bcm/cygnus-ssp.c | 39 +++++++++++++++++++++++----- sound/soc/cirrus/ep93xx-i2s.c | 16 ++++++------ sound/soc/dwc/dwc-i2s.c | 32 +++++++++++++---------- sound/soc/jz4740/jz4740-i2s.c | 18 ++++++------- sound/soc/mediatek/common/mtk-afe-fe-dai.c | 12 ++++----- sound/soc/mediatek/common/mtk-afe-fe-dai.h | 4 +-- sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 14 ++-------- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 10 +++----- sound/soc/pxa/pxa-ssp.c | 16 ++++++------ sound/soc/pxa/pxa2xx-i2s.c | 12 ++++----- sound/soc/samsung/i2s.c | 13 +++++----- sound/soc/samsung/s3c24xx-i2s.c | 8 +++--- sound/soc/samsung/spdif.c | 18 ++++++++----- sound/soc/soc-core.c | 41 ------------------------------ sound/soc/soc-dai.c | 12 --------- sound/soc/sti/sti_uniperif.c | 12 ++++----- sound/soc/ti/omap-mcpdm.c | 16 ++++++------ sound/soc/uniphier/aio-cpu.c | 31 +++++++++++++++++++--- sound/soc/uniphier/aio-ld11.c | 18 ------------- sound/soc/uniphier/aio-pxs2.c | 14 ---------- sound/soc/uniphier/aio.h | 2 -- sound/soc/ux500/ux500_msp_dai.c | 2 -- 24 files changed, 167 insertions(+), 213 deletions(-) -- 2.7.4

2 19