October 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ALSA: hda: Abort capability probe on invalid capability
by Ughreja, Rakesh A 18 Oct '17

18 Oct '17

From: Rakesh Ughreja <rakesh.a.ughreja(a)intel.com> When an invalid capability is discovered, stop traversing the capability link list further. print the invalid capability error and set it to zero Signed-off-by: Rakesh Ughreja <rakesh.a.ughreja(a)intel.com> --- sound/hda/hdac_controller.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c index 978dc18..8f7d0d9 100644 --- a/sound/hda/hdac_controller.c +++ b/sound/hda/hdac_controller.c @@ -314,7 +314,8 @@ int snd_hdac_bus_parse_capabilities(struct hdac_bus *bus) break; default: - dev_dbg(bus->dev, "Unknown capability %d\n", cur_cap); + dev_err(bus->dev, "Unknown capability %d\n", cur_cap); + cur_cap = 0; break; } -- 2.7.4

1 0

[alsa-devel] [PATCH 0/2] rt5651: Enable platforms with int mic on IN2
by Carlo Caione 18 Oct '17

18 Oct '17

From: Carlo Caione <carlo(a)endlessm.com> While working on enabling a cherry-trail laptop shipping the rt5651 codec I realized that the machine driver needed some fixup. In particular the laptop I'm working on (KIANO SlimNote 14.2) has the internal mic connected to the IN2 port. All the laptop-specific work with the related quirks will follow. Carlo Caione (2): ASoC: intel: byt: Enable quirk logic for custom maps ASoC: intel: byt: Introduce new custom IN2 map sound/soc/intel/boards/bytcr_rt5651.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) -- 2.14.2

3 4

Re: [alsa-devel] linux-next: manual merge of the sound-asoc tree with the drm-misc tree
by Mark Brown 18 Oct '17

18 Oct '17

On Wed, Oct 18, 2017 at 10:57:33AM +0100, Mark Brown wrote: > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. Actually I'm just going to discard the AMD drivers from the ASoC tree because the build produces reams of errors like those below, the changes to move the chip type definitions around weren't fully baked. Please resend both the pull request and the patches with this fixed. Note also that if you're basing something on Linus' tree you should use a tagged release rather than just a random commit. In file included from /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/amdgpu.h:51:0, from /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:31: /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/../include/amd_shared.h:33:6: error: nested redefinition of 'enum amd_asic_type' enum amd_asic_type { ^ /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/../include/amd_shared.h:33:6: error: redeclaration of 'enum amd_asic_type' In file included from /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/../include/amd_shared.h:26:0, from /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/amdgpu.h:51, from /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:31: /home/broonie/tmpfs/next/include/drm/amd_asic_type.h:28:6: note: originally defined here enum amd_asic_type { ^

2 2

[alsa-devel] [PATCH 0/4 resend] Add ASoC support for AMD Stoney APUs
by Alex Deucher 18 Oct '17

18 Oct '17

This patch set updates the AMD GPU and Audio CoProcessor (ACP) audio drivers and the designware i2s driver for Stoney (ST). ST is an APU similar to Carrizo (CZ) which already has ACP audio support. The i2s controller and ACP audio DMA engine are part of the GPU and both need updating so I would like to upstream the whole patch set via one tree if possible. I just sent a pull request for the pre-requisite patches which are available here: https://cgit.freedesktop.org/~agd5f/linux/log/?h=linus-4.14-rc4-acp-prereq This is a resend of just the non pre-requisite audio patches at Mark's request. Thanks! Alex v2: - Patch 1 is already applied to the audio tree, just including it for completeness since it's required for this patch set and it's not yet in the drm tree. - New patch to share asic types between gpu and audio drivers - ACPI ID changed for rt5650 machine driver - Integrate feedback on other patches v3: - resend remaining patches that have not been applied yet v4: - Integrate feedback from v3 - Add Mark's acks from v3 - Integrate a machine driver fix from Dylan Reid Akshu Agrawal (1): ASoC: AMD: Add machine driver for cz rt5650 Vijendar Mukunda (3): ASoC: AMD: disabling memory gating in stoney platform ASoC: AMD: DMA driver changes for Stoney Platform ASoC: AMD: Audio buffer related changes for Stoney sound/soc/amd/Kconfig | 7 ++ sound/soc/amd/Makefile | 2 + sound/soc/amd/acp-pcm-dma.c | 249 +++++++++++++++++++++++++++++++++++--------- sound/soc/amd/acp-rt5645.c | 199 +++++++++++++++++++++++++++++++++++ sound/soc/amd/acp.h | 2 + 5 files changed, 408 insertions(+), 51 deletions(-) create mode 100644 sound/soc/amd/acp-rt5645.c -- 2.5.5

1 4

[alsa-devel] [pull v2] amdgpu pre-reqs for stoney ACP audio support
by Alex Deucher 18 Oct '17

18 Oct '17

Hi Dave, Mark, This branch against Linus' 4.14-rc4 contains the 3 pre-requisite patches for Stoney ACP audio. Mark needs these patches to apply the rest of the Stoney ACP patch set on the audio side. I'll resend the stony audio patches shortly, but there are no differences from the last version I send out. Note that depending on when these changes end up in drm-next, there may be a conflict due to f674bd28146045 (drm/amdgpu Moving amdgpu asic types to a separate file). If you end up with a conflict, please take the changes in f674bd28146045, otherwise, you'll end up with the enum defined twice. Please pull. Thanks! The following changes since commit 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f: Linux 4.14-rc4 (2017-10-08 20:53:29 -0700) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux linus-4.14-rc4-acp-prereq for you to fetch changes up to f674bd281460451e8784f3bc917a650e8937a8ed: drm/amdgpu Moving amdgpu asic types to a separate file (2017-10-18 10:56:27 -0400) ---------------------------------------------------------------- Akshu Agrawal (1): drm/amdgpu Moving amdgpu asic types to a separate file Vijendar Mukunda (2): drm/amd/amdgpu: Added asic_type as ACP DMA driver platform data ASoC: AMD: Added asic_type as ACP DMA driver platform data drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 2 ++ drivers/gpu/drm/amd/include/amd_shared.h | 29 ++---------------- include/drm/amd_asic_type.h | 52 ++++++++++++++++++++++++++++++++ sound/soc/amd/acp-pcm-dma.c | 8 ++--- sound/soc/amd/acp.h | 7 +++++ 5 files changed, 65 insertions(+), 33 deletions(-) create mode 100644 include/drm/amd_asic_type.h

1 0

[alsa-devel] [PATCH] ALSA: hda - Add model string for Intel reference board quirk
by Takashi Iwai 18 Oct '17

18 Oct '17

For allowing user to apply the existing quirk on a machine with a different SSID, add a new model string entry, alc700-ref. The quirk itself was introduced in the commit b84e843644f2: "ALSA: hda/realtek - Enable jack detection function for Intel ALC700") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- Documentation/sound/hd-audio/models.rst | 2 ++ sound/pci/hda/patch_realtek.c | 1 + 2 files changed, 3 insertions(+) diff --git a/Documentation/sound/hd-audio/models.rst b/Documentation/sound/hd-audio/models.rst index 773d2bfacc6c..1fee5a4f6660 100644 --- a/Documentation/sound/hd-audio/models.rst +++ b/Documentation/sound/hd-audio/models.rst @@ -82,6 +82,8 @@ tpt460 Lenovo Thinkpad T460/560 setup dual-codecs Lenovo laptops with dual codecs +alc700-ref + Intel reference board with ALC700 codec ALC66x/67x/892 ============== diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 0ce71111b4e3..1a0163b81f5b 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6357,6 +6357,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { {.id = ALC292_FIXUP_TPT440, .name = "tpt440"}, {.id = ALC292_FIXUP_TPT460, .name = "tpt460"}, {.id = ALC233_FIXUP_LENOVO_MULTI_CODECS, .name = "dual-codecs"}, + {.id = ALC700_FIXUP_INTEL_REFERENCE, .name = "alc700-ref"}, {} }; #define ALC225_STANDARD_PINS \ -- 2.14.2

1 0

[alsa-devel] [PATCH v2 0/9] Baytrail-Cherrytrail updates
by Pierre-Louis Bossart 18 Oct '17

18 Oct '17

As discussed on the alsa-devel mailing list, here is a set of patches to fix 1. previous feedback on bytcht_rt5651 - no new functionality beyond what was already reviewed 2. cosmetic issues (variables in reverse xmas tree order, etc) 3. unnecessary clock tests 4. addition of a helper to remove duplicate code across machine drivers The last two patches were not included in the first pass, they correct an off-by-one issue which has no functional impact and remove the hard-codec compressed dailinks which don't currently work with the mainline code+publicly available firmware. Pierre-Louis Bossart (9): ASoC: Intel: bytcr_rt5651: add MCLK, quirks and cleanups ASoC: Intel: bytcr_rt5640: cosmetic fixes ASoC: Intel: cht_bsw_rt5645: cosmetic fixes ASoC: Intel: bytcht_da7213: cosmetic fixes ASoC: Intel: bytcht_es8316: remove useless code ASoC: Add helper to find codec_dai from dai_name ASoC: Intel: boards: use helper to get codec_dai ASoC: Intel: boards: fix off-by-one dailink id ASoC: Intel: boards: remove hard-coded compressed dailinks include/sound/soc.h | 14 ++ sound/soc/intel/boards/bxt_da7219_max98357a.c | 16 +- sound/soc/intel/boards/bytcht_da7213.c | 17 +- sound/soc/intel/boards/bytcht_es8316.c | 25 +-- sound/soc/intel/boards/bytcht_nocodec.c | 10 +- sound/soc/intel/boards/bytcr_rt5640.c | 105 ++++------- sound/soc/intel/boards/bytcr_rt5651.c | 236 +++++++++++++++++++++--- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 24 +-- sound/soc/intel/boards/cht_bsw_rt5645.c | 103 ++++------- sound/soc/intel/boards/cht_bsw_rt5672.c | 24 +-- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 16 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 16 +- 12 files changed, 318 insertions(+), 288 deletions(-) -- 2.11.0

4 17

[alsa-devel] [PATCH 0/6] Baytrail-Cherrytrail updates
by Pierre-Louis Bossart 18 Oct '17

18 Oct '17

As discussed on the alsa-devel mailing list, here is a set of patches to fix 1. previous feedback on bytcht_rt5651 - no new functionality beyond what was already reviewed 2. cosmetic issues (variables in reverse xmas tree order, etc) 3. unnecessary clock tests Since the changes are very small, I grouped them by machine driver instead of generating more patches. let me know if a different split is needed. The last patch addresses Andy's comment that we should not use strncmp(a,b,strlen(b)) when strcmp(a,b) is fine. This change is applied across all machine drivers. Pierre-Louis Bossart (6): ASoC: Intel: bytcr_rt5651: add MCLK support and fix quirks ASoC: Intel: bytcr_rt5651: filter codec name and fix variable declarations ASoC: Intel: bytcr_rt5640: cosmetic fixes ASoC: Intel: cht_bsw_rt5645: cosmetic fixes ASoC: Intel: bytcht_da7213: cosmetic fixes ASoC: Intel: boards: use strcmp with constant literals sound/soc/intel/boards/bxt_da7219_max98357a.c | 3 +- sound/soc/intel/boards/bytcht_da7213.c | 6 +- sound/soc/intel/boards/bytcht_es8316.c | 3 +- sound/soc/intel/boards/bytcr_rt5640.c | 79 ++++---- sound/soc/intel/boards/bytcr_rt5651.c | 257 ++++++++++++++++++++++-- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 3 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 79 ++++---- sound/soc/intel/boards/cht_bsw_rt5672.c | 3 +- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 3 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 3 +- 10 files changed, 324 insertions(+), 115 deletions(-) -- 2.11.0

5 15

[alsa-devel] Applied "ASoC: Intel: boards: remove hard-coded compressed dailinks" to the asoc tree
by Mark Brown 18 Oct '17

18 Oct '17

The patch ASoC: Intel: boards: remove hard-coded compressed dailinks has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 2193eb9631d272e5a8a7e7534830f555305aa556 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Date: Thu, 12 Oct 2017 18:38:05 -0500 Subject: [PATCH] ASoC: Intel: boards: remove hard-coded compressed dailinks The hard-coded compressed dailinks are not supported using publicly-available firmwares, which creates unnecessary user confusion [1]. Even if the firmware was available, the mainline code does not have the required .dynamic=1 and .dpcm_playback=1 fields so probably never worked as is, and last and they conflict with topology-defined streams. Remove them and move on. This can be re-enabled with SOF later in a more flexible manner. [1] http://mailman.alsa-project.org/pipermail/alsa-devel/2017-August/124868.html Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Acked-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/intel/boards/bytcht_da7213.c | 9 --------- sound/soc/intel/boards/bytcht_es8316.c | 9 --------- sound/soc/intel/boards/bytcht_nocodec.c | 8 -------- sound/soc/intel/boards/bytcr_rt5640.c | 11 +---------- sound/soc/intel/boards/bytcr_rt5651.c | 11 +---------- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 8 -------- sound/soc/intel/boards/cht_bsw_rt5645.c | 8 -------- sound/soc/intel/boards/cht_bsw_rt5672.c | 8 -------- 8 files changed, 2 insertions(+), 70 deletions(-) diff --git a/sound/soc/intel/boards/bytcht_da7213.c b/sound/soc/intel/boards/bytcht_da7213.c index 28a493e5318d..296b50640f46 100644 --- a/sound/soc/intel/boards/bytcht_da7213.c +++ b/sound/soc/intel/boards/bytcht_da7213.c @@ -185,14 +185,6 @@ static struct snd_soc_dai_link dailink[] = { .dpcm_playback = 1, .ops = &aif1_ops, }, - [MERR_DPCM_COMPR] = { - .name = "Compressed Port", - .stream_name = "Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", - }, /* CODEC<->CODEC link */ /* back ends */ { @@ -243,7 +235,6 @@ static int bytcht_da7213_probe(struct platform_device *pdev) card->dev = &pdev->dev; /* fix index of codec dai */ - dai_index = MERR_DPCM_COMPR + 1; for (i = 0; i < ARRAY_SIZE(dailink); i++) { if (!strcmp(dailink[i].codec_name, "i2c-DLGS7213:00")) { dai_index = i; diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 808e825c3b05..6acacc0aeedb 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -194,15 +194,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { .ops = &byt_cht_es8316_aif1_ops, }, - [MERR_DPCM_COMPR] = { - .name = "Compressed Port", - .stream_name = "Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", - }, - /* back ends */ { /* Only SSP2 has been tested here, so BYT-CR platforms that diff --git a/sound/soc/intel/boards/bytcht_nocodec.c b/sound/soc/intel/boards/bytcht_nocodec.c index 511e87601104..b80ec027a0e8 100644 --- a/sound/soc/intel/boards/bytcht_nocodec.c +++ b/sound/soc/intel/boards/bytcht_nocodec.c @@ -133,14 +133,6 @@ static struct snd_soc_dai_link dais[] = { .dpcm_playback = 1, .ops = &aif1_ops, }, - [MERR_DPCM_COMPR] = { - .name = "Compressed Port", - .stream_name = "Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", - }, /* CODEC<->CODEC link */ /* back ends */ { diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 6c7b71d7fed7..3eeb02036aa1 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -678,14 +678,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { .dynamic = 1, .dpcm_playback = 1, .ops = &byt_rt5640_aif1_ops, - }, - [MERR_DPCM_COMPR] = { - .name = "Baytrail Compressed Port", - .stream_name = "Baytrail Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", }, /* back ends */ { @@ -748,7 +740,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) struct sst_acpi_mach *mach; const char *i2c_name = NULL; int ret_val = 0; - int dai_index; + int dai_index = 0; int i; is_bytcr = false; @@ -762,7 +754,6 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) snd_soc_card_set_drvdata(&byt_rt5640_card, priv); /* fix index of codec dai */ - dai_index = MERR_DPCM_COMPR + 1; for (i = 0; i < ARRAY_SIZE(byt_rt5640_dais); i++) { if (!strcmp(byt_rt5640_dais[i].codec_name, "i2c-10EC5640:00")) { dai_index = i; diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index e0caee26fb0a..3076bfc0db5e 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -389,14 +389,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { .dpcm_playback = 1, .ops = &byt_rt5651_aif1_ops, }, - [MERR_DPCM_COMPR] = { - .name = "Compressed Port", - .stream_name = "Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", - }, /* CODEC<->CODEC link */ /* back ends */ { @@ -440,7 +432,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) struct sst_acpi_mach *mach; const char *i2c_name = NULL; int ret_val = 0; - int dai_index; + int dai_index = 0; int i; priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_ATOMIC); @@ -454,7 +446,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) snd_soc_card_set_drvdata(&byt_rt5651_card, priv); /* fix index of codec dai */ - dai_index = MERR_DPCM_COMPR + 1; for (i = 0; i < ARRAY_SIZE(byt_rt5651_dais); i++) { if (!strcmp(byt_rt5651_dais[i].codec_name, "i2c-10EC5651:00")) { dai_index = i; diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c index a2194d993615..14dd68edfce4 100644 --- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c +++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c @@ -350,14 +350,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .dpcm_playback = 1, .ops = &cht_aif1_ops, }, - [MERR_DPCM_COMPR] = { - .name = "Compressed Port", - .stream_name = "Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", - }, /* back ends */ { .name = "SSP2-Codec", diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index 1901b3b8f4d2..83c923c39393 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -445,14 +445,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .dpcm_playback = 1, .ops = &cht_aif1_ops, }, - [MERR_DPCM_COMPR] = { - .name = "Compressed Port", - .stream_name = "Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", - }, /* CODEC<->CODEC link */ /* back ends */ { diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c index 3464cf41c7d1..d135640702e9 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5672.c +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c @@ -302,14 +302,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .dpcm_playback = 1, .ops = &cht_aif1_ops, }, - [MERR_DPCM_COMPR] = { - .name = "Compressed Port", - .stream_name = "Compress", - .cpu_dai_name = "compress-cpu-dai", - .codec_dai_name = "snd-soc-dummy-dai", - .codec_name = "snd-soc-dummy", - .platform_name = "sst-mfld-platform", - }, /* Back End DAI links */ { -- 2.14.1

1 0

[alsa-devel] [PATCH] ASoC: wm97xx: fix compilation corner case
by Robert Jarzmik 18 Oct '17

18 Oct '17

When the old AC97 is not used, CONFIG_SND_SOC_AC97_BUS is not defined. As a consequence, in the error path, snd_soc_free_ac97_codec() is not defined and triggers a compilation error. Fix it for wm9705 and wm9712, as wm9713 is correctly written. Signed-off-by: Robert Jarzmik <robert.jarzmik(a)free.fr> --- sound/soc/codecs/wm9705.c | 8 ++------ sound/soc/codecs/wm9712.c | 7 ++----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index 68c204e3599f..2c09f71fe433 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c @@ -321,7 +321,6 @@ static int wm9705_soc_probe(struct snd_soc_codec *codec) { struct wm9705_priv *wm9705 = snd_soc_codec_get_drvdata(codec); struct regmap *regmap; - int ret; if (wm9705->mfd_pdata) { wm9705->ac97 = wm9705->mfd_pdata->ac97; @@ -337,8 +336,8 @@ static int wm9705_soc_probe(struct snd_soc_codec *codec) regmap = regmap_init_ac97(wm9705->ac97, &wm9705_regmap_config); if (IS_ERR(regmap)) { - ret = PTR_ERR(regmap); - goto err_free_ac97_codec; + snd_soc_free_ac97_codec(wm9705->ac97); + return PTR_ERR(regmap); } #endif } @@ -347,9 +346,6 @@ static int wm9705_soc_probe(struct snd_soc_codec *codec) snd_soc_codec_init_regmap(codec, regmap); return 0; -err_free_ac97_codec: - snd_soc_free_ac97_codec(wm9705->ac97); - return ret; } static int wm9705_soc_remove(struct snd_soc_codec *codec) diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 9db5c7783de5..4f6d1a442bc4 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -656,8 +656,8 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec) regmap = regmap_init_ac97(wm9712->ac97, &wm9712_regmap_config); if (IS_ERR(regmap)) { - ret = PTR_ERR(regmap); - goto err_free_ac97_codec; + snd_soc_free_ac97_codec(wm9712->ac97); + return PTR_ERR(regmap); } #endif } @@ -668,9 +668,6 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec) snd_soc_update_bits(codec, AC97_VIDEO, 0x3000, 0x3000); return 0; -err_free_ac97_codec: - snd_soc_free_ac97_codec(wm9712->ac97); - return ret; } static int wm9712_soc_remove(struct snd_soc_codec *codec) -- 2.11.0

3 2