Unverified Commit 8e84fd22 authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files

ASoC: intel/sdw_utils: move rt700 and rt711 codec helper functions 

Move RT700 and RT711 Soundwire codec helper functions to common
place holder so that it can be used by other platform machine driver.

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-18-Vijendar.Mukunda@amd.com


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

include/sound/soc_sdw_utils.h

+9 −0
Original line number Diff line number Diff line
@@ -85,6 +85,13 @@ const char *asoc_sdw_get_codec_name(struct device *dev, 
/* 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,

			struct asoc_sdw_codec_info *info,

			bool playback);

int asoc_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);



/* RT711-SDCA support */

int asoc_sdw_rt_sdca_jack_init(struct snd_soc_card *card,

			       struct snd_soc_dai_link *dai_links,
@@ -95,6 +102,8 @@ int asoc_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_lin 
/* dai_link init callbacks */

int asoc_sdw_rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

sound/soc/intel/boards/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ snd-soc-sof-ssp-amp-y := sof_ssp_amp.o 
snd-soc-sof-sdw-y += sof_sdw.o				\

			sof_sdw_maxim.o sof_sdw_rt_amp.o	\

			bridge_cs35l56.o			\

			sof_sdw_rt700.o sof_sdw_rt711.o		\

			sof_sdw_cs42l42.o sof_sdw_cs42l43.o	\

			sof_sdw_cs_amp.o			\

			sof_sdw_hdmi.o

sound/soc/intel/boards/sof_sdw_common.h

+0 −9
Original line number Diff line number Diff line
@@ -89,13 +89,6 @@ int sof_sdw_hdmi_init(struct snd_soc_pcm_runtime *rtd); 


int sof_sdw_hdmi_card_late_probe(struct snd_soc_card *card);



/* RT711 support */

int asoc_sdw_rt711_init(struct snd_soc_card *card,

			struct snd_soc_dai_link *dai_links,

			struct asoc_sdw_codec_info *info,

			bool playback);

int asoc_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);



/* RT1308 I2S support */

extern const struct snd_soc_ops soc_sdw_rt1308_i2s_ops;
@@ -142,8 +135,6 @@ int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_so 
int asoc_sdw_cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int asoc_sdw_rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);



#endif

sound/soc/sdw_utils/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

snd-soc-sdw-utils-y := soc_sdw_utils.o soc_sdw_dmic.o soc_sdw_rt_dmic.o \

		       soc_sdw_rt700.o soc_sdw_rt711.o 			\

		       soc_sdw_rt712_sdca.o soc_sdw_rt722_sdca.o	\

		       soc_sdw_rt5682.o soc_sdw_rt_sdca_jack_common.o

obj-$(CONFIG_SND_SOC_SDW_UTILS) += snd-soc-sdw-utils.o

sound/soc/intel/boards/sof_sdw_rt700.c→sound/soc/sdw_utils/soc_sdw_rt700.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_rt700 - Helpers to handle RT700 from generic machine driver

 *  soc_sdw_rt700 - Helpers to handle RT700 from generic machine driver

 */



#include <linux/device.h>
@@ -13,7 +15,7 @@ 
#include <sound/soc-acpi.h>

#include <sound/soc-dapm.h>

#include <sound/jack.h>

#include "sof_sdw_common.h"

#include <sound/soc_sdw_utils.h>



static const struct snd_soc_dapm_route rt700_map[] = {

	/* Headphones */
@@ -83,4 +85,4 @@ int asoc_sdw_rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai 


	return ret;

}

MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_BOARD_HELPERS);
 
EXPORT_SYMBOL_NS(asoc_sdw_rt700_rtd_init, SND_SOC_SDW_UTILS);