Unverified Commit 89b3456e authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files

ASoC: intel/sdw_utils: move rt722 sdca helper functions 

Move RT722 SDCA codec helper file to sdw_utils folder to make it generic.

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


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

include/sound/soc_sdw_utils.h

+1 −0
Original line number Diff line number Diff line
@@ -75,5 +75,6 @@ int asoc_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd); 
/* 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_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);



#endif

sound/soc/intel/boards/Makefile

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

			sof_sdw_rt5682.o sof_sdw_rt700.o	\

			sof_sdw_rt711.o sof_sdw_rt_sdca_jack_common.o	\

			sof_sdw_rt722_sdca.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 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ int asoc_sdw_maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_ 
int asoc_sdw_rt5682_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_rt722_spk_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);

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

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 soc_sdw_dmic.o soc_sdw_rt_dmic.o \

		       soc_sdw_rt712_sdca.o

		       soc_sdw_rt712_sdca.o soc_sdw_rt722_sdca.o

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

sound/soc/intel/boards/sof_sdw_rt722_sdca.c→sound/soc/sdw_utils/soc_sdw_rt722_sdca.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) 2023 Intel Corporation

// Copyright (c) 2024 Advanced Micro Devices, Inc.



/*

 *  sof_sdw_rt722_sdca - Helpers to handle RT722-SDCA from generic machine driver

 *  soc_sdw_rt722_sdca - Helpers to handle RT722-SDCA from generic machine driver

 */



#include <linux/device.h>
@@ -13,7 +15,7 @@ 
#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_route rt722_spk_map[] = {

	{ "Speaker", NULL, "rt722 SPK" },
@@ -36,4 +38,4 @@ int asoc_sdw_rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_ 


	return ret;

}

EXPORT_SYMBOL_NS(asoc_sdw_rt722_spk_rtd_init, SND_SOC_SDW_UTILS);