Unverified Commit 4776d0c9 authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files

ASoC: intel/sdw_utils: move dmic codec helper function 

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: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://patch.msgid.link/20240801091446.10457-11-Vijendar.Mukunda@amd.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 941d6933

include/sound/soc_sdw_utils.h

+4 −0
Original line number Diff line number Diff line
@@ -68,4 +68,8 @@ const char *asoc_sdw_get_codec_name(struct device *dev, 
				    const struct asoc_sdw_codec_info *codec_info,

				    const struct snd_soc_acpi_link_adr *adr_link,

				    int adr_index);



/* DMIC support */

int asoc_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);



#endif

sound/soc/intel/boards/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ snd-soc-sof-sdw-y += sof_sdw.o \ 
			sof_sdw_rt_dmic.o			\

			sof_sdw_cs42l42.o sof_sdw_cs42l43.o	\

			sof_sdw_cs_amp.o			\

			sof_sdw_dmic.o				\

			sof_sdw_hdmi.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

sound/soc/intel/boards/sof_sdw_common.h

+0 −3
Original line number Diff line number Diff line
@@ -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);



/* DMIC support */

int asoc_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);



/* RT711 support */

int asoc_sdw_rt711_init(struct snd_soc_card *card,

			struct snd_soc_dai_link *dai_links,

sound/soc/sdw_utils/Makefile

+1 −1
Original line number Diff line number Diff line 
# 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

sound/soc/intel/boards/sof_sdw_dmic.c→sound/soc/sdw_utils/soc_sdw_dmic.c

+5 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

// This file incorporates work covered by the following copyright notice:

// 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-acpi.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[] = {

	SND_SOC_DAPM_MIC("SoC DMIC", NULL),
@@ -40,4 +42,4 @@ int asoc_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd) 


	return ret;

}

EXPORT_SYMBOL_NS(asoc_sdw_dmic_init, SND_SOC_SDW_UTILS);