kevin/linux
1
Fork 0
Code

ASoC: intel/sdw_utils: move dmic codec helper function

Browse Source 
Move generic dmic codec helper function implementation to
sdw_utils folder so that this function can be used by other platform
machine drivers.

Link: https://github.com/thesofproject/linux/pull/5068
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://patch.msgid.link/20240801091446.10457-11-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Vijendar Mukunda 2024-08-01 14:44:25 +05:30 committed by Mark Brown
parent 941d6933eb
commit 4776d0c908
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sound/soc_sdw_utils.h
View File

@ -68,4 +68,8 @@ const char *asoc_sdw_get_codec_name(struct device *dev,
const struct asoc_sdw_codec_info *codec_info, const struct asoc_sdw_codec_info *codec_info,
const struct snd_soc_acpi_link_adr *adr_link, const struct snd_soc_acpi_link_adr *adr_link,
int adr_index); int adr_index);
/* DMIC support */
int asoc_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);
#endif #endif

1
sound/soc/intel/boards/Makefile
View File

@ -43,7 +43,6 @@ snd-soc-sof-sdw-y += sof_sdw.o \
sof_sdw_rt_dmic.o \ sof_sdw_rt_dmic.o \
sof_sdw_cs42l42.o sof_sdw_cs42l43.o \ sof_sdw_cs42l42.o sof_sdw_cs42l43.o \
sof_sdw_cs_amp.o \ sof_sdw_cs_amp.o \
sof_sdw_dmic.o \
sof_sdw_hdmi.o sof_sdw_hdmi.o
obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o
obj-$(CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH) += snd-soc-sof_cs42l42.o obj-$(CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH) += snd-soc-sof_cs42l42.o

3
sound/soc/intel/boards/sof_sdw_common.h
View File

@ -97,9 +97,6 @@ int sof_sdw_hdmi_init(struct snd_soc_pcm_runtime *rtd);
int sof_sdw_hdmi_card_late_probe(struct snd_soc_card *card); int sof_sdw_hdmi_card_late_probe(struct snd_soc_card *card);
/* DMIC support */
int asoc_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);
/* RT711 support */ /* RT711 support */
int asoc_sdw_rt711_init(struct snd_soc_card *card, int asoc_sdw_rt711_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,

2
sound/soc/sdw_utils/Makefile
View File

@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
snd-soc-sdw-utils-y := soc_sdw_utils.o snd-soc-sdw-utils-y := soc_sdw_utils.o soc_sdw_dmic.o
obj-$(CONFIG_SND_SOC_SDW_UTILS) += snd-soc-sdw-utils.o obj-$(CONFIG_SND_SOC_SDW_UTILS) += snd-soc-sdw-utils.o

8
sound/soc/intel/boards/sof_sdw_dmic.c → sound/soc/sdw_utils/soc_sdw_dmic.c
View File

@ -1,14 +1,16 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
// This file incorporates work covered by the following copyright notice:
// Copyright (c) 2020 Intel Corporation // Copyright (c) 2020 Intel Corporation
// Copyright (c) 2024 Advanced Micro Devices, Inc.
/* /*
* sof_sdw_dmic - Helpers to handle dmic from generic machine driver * soc_sdw_dmic - Helpers to handle dmic from generic machine driver
*/ */
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/soc-acpi.h> #include <sound/soc-acpi.h>
#include <sound/soc-dapm.h> #include <sound/soc-dapm.h>
#include "sof_sdw_common.h" #include <sound/soc_sdw_utils.h>
static const struct snd_soc_dapm_widget dmic_widgets[] = { static const struct snd_soc_dapm_widget dmic_widgets[] = {
SND_SOC_DAPM_MIC("SoC DMIC", NULL), SND_SOC_DAPM_MIC("SoC DMIC", NULL),
@ -40,4 +42,4 @@ int asoc_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd)
return ret; return ret;
} }
EXPORT_SYMBOL_NS(asoc_sdw_dmic_init, SND_SOC_SDW_UTILS);