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

[alsa-devel] [PATCH v5] dt-bindings: sound: Convert Samsung I2S controller to dt-schema
by Marek Szyprowski 27 Sep '19

27 Sep '19

From: Maciej Falkowski <m.falkowski(a)samsung.com> Convert Samsung I2S controller to newer dt-schema format. Signed-off-by: Maciej Falkowski <m.falkowski(a)samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski(a)samsung.com> --- v5: - Removed '#clock-cells' property from required properties - Added deprecated property to 'clock-output-names' and removed corresponding comment. Best regards, Maciej Falkowski --- .../devicetree/bindings/sound/samsung-i2s.txt | 84 ----------- .../bindings/sound/samsung-i2s.yaml | 136 ++++++++++++++++++ 2 files changed, 136 insertions(+), 84 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/samsung-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/samsung-i2s.yaml diff --git a/Documentation/devicetree/bindings/sound/samsung-i2s.txt b/Documentation/devicetree/bindings/sound/samsung-i2s.txt deleted file mode 100644 index a88cb00fa096..000000000000 --- a/Documentation/devicetree/bindings/sound/samsung-i2s.txt +++ /dev/null @@ -1,84 +0,0 @@ -* Samsung I2S controller - -Required SoC Specific Properties: - -- compatible : should be one of the following. - - samsung,s3c6410-i2s: for 8/16/24bit stereo I2S. - - samsung,s5pv210-i2s: for 8/16/24bit multichannel(5.1) I2S with - secondary fifo, s/w reset control and internal mux for root clk src. - - samsung,exynos5420-i2s: for 8/16/24bit multichannel(5.1) I2S for - playback, stereo channel capture, secondary fifo using internal - or external dma, s/w reset control, internal mux for root clk src - and 7.1 channel TDM support for playback. TDM (Time division multiplexing) - is to allow transfer of multiple channel audio data on single data line. - - samsung,exynos7-i2s: with all the available features of exynos5 i2s, - exynos7 I2S has 7.1 channel TDM support for capture, secondary fifo - with only external dma and more no.of root clk sampling frequencies. - - samsung,exynos7-i2s1: I2S1 on previous samsung platforms supports - stereo channels. exynos7 i2s1 upgraded to 5.1 multichannel with - slightly modified bit offsets. - -- reg: physical base address of the controller and length of memory mapped - region. -- dmas: list of DMA controller phandle and DMA request line ordered pairs. -- dma-names: identifier string for each DMA request line in the dmas property. - These strings correspond 1:1 with the ordered pairs in dmas. -- clocks: Handle to iis clock and RCLK source clk. -- clock-names: - i2s0 uses some base clocks from CMU and some are from audio subsystem internal - clock controller. The clock names for i2s0 should be "iis", "i2s_opclk0" and - "i2s_opclk1" as shown in the example below. - i2s1 and i2s2 uses clocks from CMU. The clock names for i2s1 and i2s2 should - be "iis" and "i2s_opclk0". - "iis" is the i2s bus clock and i2s_opclk0, i2s_opclk1 are sources of the root - clk. i2s0 has internal mux to select the source of root clk and i2s1 and i2s2 - doesn't have any such mux. -- #clock-cells: should be 1, this property must be present if the I2S device - is a clock provider in terms of the common clock bindings, described in - ../clock/clock-bindings.txt. -- clock-output-names (deprecated): from the common clock bindings, names of - the CDCLK I2S output clocks, suggested values are "i2s_cdclk0", "i2s_cdclk1", - "i2s_cdclk3" for the I2S0, I2S1, I2S2 devices respectively. - -There are following clocks available at the I2S device nodes: - CLK_I2S_CDCLK - the CDCLK (CODECLKO) gate clock, - CLK_I2S_RCLK_PSR - the RCLK prescaler divider clock (corresponding to the - IISPSR register), - CLK_I2S_RCLK_SRC - the RCLKSRC mux clock (corresponding to RCLKSRC bit in - IISMOD register). - -Refer to the SoC datasheet for availability of the above clocks. -The CLK_I2S_RCLK_PSR and CLK_I2S_RCLK_SRC clocks are usually only available -in the IIS Multi Audio Interface. - -Note: Old DTs may not have the #clock-cells property and then not use the I2S -node as a clock supplier. - -Optional SoC Specific Properties: - -- samsung,idma-addr: Internal DMA register base address of the audio - sub system(used in secondary sound source). -- pinctrl-0: Should specify pin control groups used for this controller. -- pinctrl-names: Should contain only one value - "default". -- #sound-dai-cells: should be 1. - - -Example: - -i2s0: i2s@3830000 { - compatible = "samsung,s5pv210-i2s"; - reg = <0x03830000 0x100>; - dmas = <&pdma0 10 - &pdma0 9 - &pdma0 8>; - dma-names = "tx", "rx", "tx-sec"; - clocks = <&clock_audss EXYNOS_I2S_BUS>, - <&clock_audss EXYNOS_I2S_BUS>, - <&clock_audss EXYNOS_SCLK_I2S>; - clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; - #clock-cells = <1>; - samsung,idma-addr = <0x03000000>; - pinctrl-names = "default"; - pinctrl-0 = <&i2s0_bus>; - #sound-dai-cells = <1>; -}; diff --git a/Documentation/devicetree/bindings/sound/samsung-i2s.yaml b/Documentation/devicetree/bindings/sound/samsung-i2s.yaml new file mode 100644 index 000000000000..b9502b82fa9d --- /dev/null +++ b/Documentation/devicetree/bindings/sound/samsung-i2s.yaml @@ -0,0 +1,136 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/samsung-i2s.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Samsung SoC I2S controller + +maintainers: + - Krzysztof Kozlowski <krzk(a)kernel.org> + - Sylwester Nawrocki <s.nawrocki(a)samsung.com> + +properties: + compatible: + description: | + samsung,s3c6410-i2s: for 8/16/24bit stereo I2S. + + samsung,s5pv210-i2s: for 8/16/24bit multichannel(5.1) I2S with + secondary fifo, s/w reset control and internal mux for root clk src. + + samsung,exynos5420-i2s: for 8/16/24bit multichannel(5.1) I2S for + playback, stereo channel capture, secondary fifo using internal + or external dma, s/w reset control, internal mux for root clk src + and 7.1 channel TDM support for playback. TDM (Time division multiplexing) + is to allow transfer of multiple channel audio data on single data line. + + samsung,exynos7-i2s: with all the available features of exynos5 i2s. + exynos7 I2S has 7.1 channel TDM support for capture, secondary fifo + with only external dma and more no.of root clk sampling frequencies. + + samsung,exynos7-i2s1: I2S1 on previous samsung platforms supports + stereo channels. exynos7 i2s1 upgraded to 5.1 multichannel with + slightly modified bit offsets. + enum: + - samsung,s3c6410-i2s + - samsung,s5pv210-i2s + - samsung,exynos5420-i2s + - samsung,exynos7-i2s + - samsung,exynos7-i2s1 + + reg: + maxItems: 1 + + dmas: + minItems: 2 + maxItems: 3 + + dma-names: + oneOf: + - items: + - const: tx + - const: rx + - items: + - const: tx + - const: rx + - const: tx-sec + + clocks: + minItems: 1 + maxItems: 3 + + clock-names: + oneOf: + - items: + - const: iis + - items: # for i2s0 + - const: iis + - const: i2s_opclk0 + - const: i2s_opclk1 + - items: # for i2s1 and i2s2 + - const: iis + - const: i2s_opclk0 + description: | + "iis" is the i2s bus clock and i2s_opclk0, i2s_opclk1 are sources + of the root clk. i2s0 has internal mux to select the source + of root clk and i2s1 and i2s2 doesn't have any such mux. + + "#clock-cells": + const: 1 + + clock-output-names: + deprecated: true + oneOf: + - items: # for i2s0 + - const: i2s_cdclk0 + - items: # for i2s1 + - const: i2s_cdclk1 + - items: # for i2s2 + - const: i2s_cdclk2 + description: Names of the CDCLK I2S output clocks. + + samsung,idma-addr: + $ref: /schemas/types.yaml#/definitions/uint32 + description: | + Internal DMA register base address of the audio + sub system(used in secondary sound source). + + pinctrl-0: + description: Should specify pin control groups used for this controller. + + pinctrl-names: + const: default + + "#sound-dai-cells": + const: 1 + +required: + - compatible + - reg + - dmas + - dma-names + - clocks + - clock-names + +examples: + - | + #include <dt-bindings/clock/exynos-audss-clk.h> + + i2s0: i2s@3830000 { + compatible = "samsung,s5pv210-i2s"; + reg = <0x03830000 0x100>; + dmas = <&pdma0 10>, + <&pdma0 9>, + <&pdma0 8>; + dma-names = "tx", "rx", "tx-sec"; + clocks = <&clock_audss EXYNOS_I2S_BUS>, + <&clock_audss EXYNOS_I2S_BUS>, + <&clock_audss EXYNOS_SCLK_I2S>; + clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; + #clock-cells = <1>; + samsung,idma-addr = <0x03000000>; + pinctrl-names = "default"; + pinctrl-0 = <&i2s0_bus>; + #sound-dai-cells = <1>; + }; + -- 2.17.1

4 3

[alsa-devel] [PATCH] ASoC: Skylake SST driver - blacklist the PCI device IDs for the auto probe
by Jaroslav Kysela 27 Sep '19

27 Sep '19

There are basically three drivers for the PCI devices for the recent Intel hardware with the build-in DSPs. The legacy HDA driver has dmic_detect module option for the auto detection of the platforms with the digital microphone. Because the SOF driver is preferred, just skip PCI probe in the Skylake SST driver when the PCI device ID clashes by default. The user can override the auto behaviour with the pci_binding module parameter. Boot log from Lenovo Carbon X1 (7th gen) with the default settings: snd_hda_intel 0000:00:1f.3: Digital mics found on Skylake+ platform, aborting probe snd_soc_skl 0000:00:1f.3: SOF driver is preferred on this platform, aborting probe sof-audio-pci 0000:00:1f.3: warning: No matching ASoC machine driver found sof-audio-pci 0000:00:1f.3: DSP detected with PCI class/subclass/prog-if 0x040380 .... Perhaps, it may be more wise to create one shared module and all three drivers should call the driver detection routine(s) from one place. Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/intel/skylake/skl.c | 37 +++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 141dbbf975ac..cace55ca8d55 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -38,6 +38,39 @@ static int skl_pci_binding; module_param_named(pci_binding, skl_pci_binding, int, 0444); MODULE_PARM_DESC(pci_binding, "PCI binding (0=auto, 1=only legacy, 2=only asoc"); +/* + * + */ +static int skl_sof_support(struct pci_dev *pci) +{ + /* the SOF driver has same PCI IDs */ + if (pci->vendor == 0x8086) { + switch (pci->device) { +#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_LP) + case 0x02c8: /* CML-LP */ +#endif +#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H) + case 0x06c8: /* CML-H */ +#endif +#if IS_ENABLED(CONFIG_SND_SOC_SOF_GEMINILAKE) + case 0x3198: /* GLK */ +#endif +#if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE) + case 0x5a98: /* BXT-P */ +#endif +#if IS_ENABLED(CONFIG_SND_SOC_SOF_CANNONLAKE) + case 0x9dc8: /* CNL */ +#endif +#if IS_ENABLED(CONFIG_SND_SOC_SOF_COFFEELAKE) + case 0xa348: /* CFL */ +#endif + case 0x0000: /* a dummy value when no SOF driver enabled */ + return 1; + } + } + return 0; +} + /* * initialize the PCI registers */ @@ -1002,6 +1035,10 @@ static int skl_probe(struct pci_dev *pci, dev_err(&pci->dev, "Unknown PCI class/subclass/prog-if information (0x%06x) found, aborting probe\n", pci->class); return -ENODEV; } + if (skl_sof_support(pci)) { + dev_info(&pci->dev, "SOF driver is preferred on this platform, aborting probe\n"); + return -ENODEV; + } dev_info(&pci->dev, "DSP detected with PCI class/subclass/prog-if info 0x%06x\n", pci->class); break; case SND_SKL_PCI_BIND_LEGACY: -- 2.20.1

4 10

[alsa-devel] [PATCH] ASoC: amd: acp3x: clean up an indentation issue
by Colin King 27 Sep '19

27 Sep '19

From: Colin Ian King <colin.king(a)canonical.com> There is a return statement that is indented too deeply, remove the extraneous tab. Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/amd/raven/acp3x-pcm-dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index bc4dfafdfcd1..ea57088d50ce 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -631,7 +631,7 @@ static int acp3x_audio_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { dev_err(&pdev->dev, "IORESOURCE_IRQ FAILED\n"); - return -ENODEV; + return -ENODEV; } adata = devm_kzalloc(&pdev->dev, sizeof(*adata), GFP_KERNEL); -- 2.20.1

3 2

[alsa-devel] sof-skl_hda: remove volume setting in enable/disable sequences
by GitHub pull_request - opened 27 Sep '19

27 Sep '19

alsa-project/alsa-ucm-conf pull request #2 was opened from juimonen: If the volume setting is defined in enable sequence you will always get that exact volume when switching outputs in some user space software like Pulseaudio. Pulseaudio will itself keep track of the volume previously set. Signed-off-by: Jaska Uimonen <jaska.uimonen(a)linux.intel.com> Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/2 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/2.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[alsa-devel] Playback volumes
by GitHub pull_request - opened 27 Sep '19

27 Sep '19

alsa-project/alsa-ucm-conf pull request #1 was opened from juimonen: Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/1 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/1.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[alsa-devel] [PATCH] ASoC: bdw-rt5677: channel constraint support
by Brent Lu 27 Sep '19

27 Sep '19

BDW boards using this machine driver supports only stereo capture and playback. Implement a constraint to enforce it. Signed-off-by: Brent Lu <brent.lu(a)intel.com> --- sound/soc/intel/boards/bdw-rt5677.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c index 4a4d335..a312b55 100644 --- a/sound/soc/intel/boards/bdw-rt5677.c +++ b/sound/soc/intel/boards/bdw-rt5677.c @@ -22,6 +22,8 @@ #include "../../codecs/rt5677.h" +#define DUAL_CHANNEL 2 + struct bdw_rt5677_priv { struct gpio_desc *gpio_hp_en; struct snd_soc_component *component; @@ -245,6 +247,36 @@ static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd) return 0; } +static const unsigned int channels[] = { + DUAL_CHANNEL, +}; + +static const struct snd_pcm_hw_constraint_list constraints_channels = { + .count = ARRAY_SIZE(channels), + .list = channels, + .mask = 0, +}; + +static int bdw_fe_startup(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + + /* + * On this platform for PCM device we support, + * stereo + */ + + runtime->hw.channels_max = DUAL_CHANNEL; + snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, + &constraints_channels); + + return 0; +} + +static const struct snd_soc_ops bdw_rt5677_fe_ops = { + .startup = bdw_fe_startup, +}; + /* broadwell digital audio interface glue - connects codec <--> CPU */ SND_SOC_DAILINK_DEF(dummy, DAILINK_COMP_ARRAY(COMP_DUMMY())); @@ -273,6 +305,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { }, .dpcm_capture = 1, .dpcm_playback = 1, + .ops = &bdw_rt5677_fe_ops, SND_SOC_DAILINK_REG(fe, dummy, platform), }, -- 2.7.4

4 9

[alsa-devel] [PATCH 0/4] ASoC: mt8183: fix audio playback slowly after playback
by Jiaxin Yu 27 Sep '19

27 Sep '19

This series patches add reset controller for MT8183, and audio will use it in machine driver during bootup, they depend on the following patch: 1. this series add support reset-controller in infra [v5,2/2] clk: reset: Modify reset-controller driver *** BLURB HERE *** Jiaxin Yu (2): WIP: dt-bindings: medaitek: mt8183: add property "resets" && "reset-names" WIP: ASoC: mt8183: fix audio playback slowly after playback during bootup yong.liang (2): WIP: dt-bindings: mediatek: mt8183: Add #reset-cells WIP: watchdog: mtk_wdt: mt8183: Add reset controller .../bindings/sound/mt8183-afe-pcm.txt | 6 + .../devicetree/bindings/watchdog/mtk-wdt.txt | 9 +- drivers/watchdog/Kconfig | 1 + drivers/watchdog/mtk_wdt.c | 110 +++++++++++++++++- .../reset-controller/mt8183-resets.h | 13 +++ sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 15 +++ 6 files changed, 150 insertions(+), 4 deletions(-) -- 2.18.0

1 4

[alsa-devel] [PATCH] ALSA: hda - Force polling mode on CML for fixing codec communication
by Sathyanarayana Nujella 26 Sep '19

26 Sep '19

We observed the same issue as reported by commit a8d7bde23e7130686b7662 ("ALSA: hda - Force polling mode on CFL for fixing codec communication") Apply the same fix to CML. Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella(a)intel.com> Signed-off-by: Joyce Toh <joyce.toh(a)intel.com> --- sound/pci/hda/hda_intel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 91e71be42fa4..e6997a5bf098 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -370,6 +370,7 @@ enum { #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) #define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348) #define IS_CNL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9dc8) +#define IS_CML(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x02c8) static char *driver_short_names[] = { [AZX_DRIVER_ICH] = "HDA Intel", @@ -1754,7 +1755,7 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, azx_bus(chip)->dma_type = SNDRV_DMA_TYPE_DEV_UC; /* Workaround for a communication error on CFL (bko#199007) and CNL */ - if (IS_CFL(pci) || IS_CNL(pci)) + if (IS_CFL(pci) || IS_CNL(pci) || IS_CML(pci)) azx_bus(chip)->polling_mode = 1; if (chip->driver_type == AZX_DRIVER_NVIDIA) { -- 2.7.4

4 3

[alsa-devel] [PATCH] ASoC: topology: Fix a signedness bug in soc_tplg_dapm_widget_create()
by Dan Carpenter 26 Sep '19

26 Sep '19

The "template.id" variable is an enum and in this context GCC will treat it as an unsigned int so it can never be less than zero. Fixes: 8a9782346dcc ("ASoC: topology: Add topology core") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- sound/soc/soc-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index aa9a1fca46fa..0fd032914a31 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1582,7 +1582,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, /* map user to kernel widget ID */ template.id = get_widget_id(le32_to_cpu(w->id)); - if (template.id < 0) + if ((int)template.id < 0) return template.id; /* strings are allocated here, but used and freed by the widget */ -- 2.20.1

2 1

[alsa-devel] [PATCH] ASoC: amd: Missing Initialization of IRQFLAGS
by Ravulapati Vishnu vardhan rao 26 Sep '19

26 Sep '19

Fix for missing initialization of IRQFLAGS in ACP-PCI driver and Missing Macro of ACP3x_DEVS. Follow up to IDb33df346 Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/pci-acp3x.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index 627798a..3887ea0 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -219,7 +219,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, sizeof(struct resource) * 4, GFP_KERNEL); adata->cell = devm_kzalloc(&pci->dev, - sizeof(struct mfd_cell) * 3, + sizeof(struct mfd_cell) * ACP3x_DEVS, GFP_KERNEL); if (!adata->cell) { ret = -ENOMEM; @@ -260,6 +260,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, adata->res[3].flags = IORESOURCE_IRQ; adata->res[3].start = pci->irq; adata->res[3].end = adata->res[3].start; + irqflags = 0; adata->acp3x_audio_mode = ACP3x_I2S_MODE; @@ -282,8 +283,9 @@ static int snd_acp3x_probe(struct pci_dev *pci, adata->cell[2].platform_data = &i2s_pdata[1]; adata->cell[2].pdata_size = sizeof(struct i2s_platform_data); - r = mfd_add_hotplug_devices(adata->parent, adata->cell, 3); - for (i = 0; i < 3 ; i++) + r = mfd_add_hotplug_devices(adata->parent, adata->cell, + ACP3x_DEVS); + for (i = 0; i < ACP3x_DEVS ; i++) dev = get_mfd_cell_dev(adata->cell[i].name, i); break; -- 2.7.4

2 1