Skip to content

L
linux
Commit 6588fcc8 authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files
Options

ASoC: intel: rename codec_info and dai_info structures names 

To make it generic, rename structure 'sof_sdw_codec_info' as
'asoc_sdw_codec_info' and 'sof_sdw_dai_info' as 'asoc_sdw_dai_info'.
These structures will be moved to common header file so that it can
be used by other platform machine driver.

Link: https://github.com/thesofproject/linux/pull/5068Signed-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-2-Vijendar.Mukunda@amd.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8400291e
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
sound/soc/intel/boards/bridge_cs35l56.c
View file @ 6588fcc8
...@@ -127,7 +127,7 @@ int bridge_cs35l56_add_sidecar(struct snd_soc_card *card, ...@@ -127,7 +127,7 @@ int bridge_cs35l56_add_sidecar(struct snd_soc_card *card,
int bridge_cs35l56_spk_init(struct snd_soc_card *card, int bridge_cs35l56_spk_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct sof_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback) bool playback)
{ {
if (sof_sdw_quirk & SOF_SIDECAR_AMPS) if (sof_sdw_quirk & SOF_SIDECAR_AMPS)
......
sound/soc/intel/boards/sof_sdw.c
View file @ 6588fcc8
...@@ -731,7 +731,7 @@ static const struct snd_soc_ops sdw_ops = { ...@@ -731,7 +731,7 @@ static const struct snd_soc_ops sdw_ops = {
.shutdown = sdw_shutdown, .shutdown = sdw_shutdown,
}; };
static struct sof_sdw_codec_info codec_info_list[] = { static struct asoc_sdw_codec_info codec_info_list[] = {
{ {
.part_id = 0x700, .part_id = 0x700,
.dais = { .dais = {
...@@ -1220,7 +1220,7 @@ static struct sof_sdw_codec_info codec_info_list[] = { ...@@ -1220,7 +1220,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
}, },
}; };
static struct sof_sdw_codec_info *find_codec_info_part(const u64 adr) static struct asoc_sdw_codec_info *find_codec_info_part(const u64 adr)
{ {
unsigned int part_id, sdw_version; unsigned int part_id, sdw_version;
int i; int i;
...@@ -1241,7 +1241,7 @@ static struct sof_sdw_codec_info *find_codec_info_part(const u64 adr) ...@@ -1241,7 +1241,7 @@ static struct sof_sdw_codec_info *find_codec_info_part(const u64 adr)
} }
static struct sof_sdw_codec_info *find_codec_info_acpi(const u8 *acpi_id) static struct asoc_sdw_codec_info *find_codec_info_acpi(const u8 *acpi_id)
{ {
int i; int i;
...@@ -1255,7 +1255,7 @@ static struct sof_sdw_codec_info *find_codec_info_acpi(const u8 *acpi_id) ...@@ -1255,7 +1255,7 @@ static struct sof_sdw_codec_info *find_codec_info_acpi(const u8 *acpi_id)
return NULL; return NULL;
} }
static struct sof_sdw_codec_info *find_codec_info_dai(const char *dai_name, static struct asoc_sdw_codec_info *find_codec_info_dai(const char *dai_name,
int *dai_index) int *dai_index)
{ {
int i, j; int i, j;
...@@ -1355,7 +1355,7 @@ static bool is_unique_device(const struct snd_soc_acpi_link_adr *adr_link, ...@@ -1355,7 +1355,7 @@ static bool is_unique_device(const struct snd_soc_acpi_link_adr *adr_link,
} }
static const char *get_codec_name(struct device *dev, static const char *get_codec_name(struct device *dev,
const struct sof_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)
{ {
...@@ -1383,7 +1383,7 @@ static const char *get_codec_name(struct device *dev, ...@@ -1383,7 +1383,7 @@ static const char *get_codec_name(struct device *dev,
static int sof_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd) static int sof_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
struct sof_sdw_codec_info *codec_info; struct asoc_sdw_codec_info *codec_info;
struct snd_soc_dai *dai; struct snd_soc_dai *dai;
int dai_index; int dai_index;
int ret; int ret;
...@@ -1451,8 +1451,8 @@ struct sof_sdw_endpoint { ...@@ -1451,8 +1451,8 @@ struct sof_sdw_endpoint {
const char *name_prefix; const char *name_prefix;
bool include_sidecar; bool include_sidecar;
struct sof_sdw_codec_info *codec_info; struct asoc_sdw_codec_info *codec_info;
const struct sof_sdw_dai_info *dai_info; const struct asoc_sdw_dai_info *dai_info;
}; };
struct sof_sdw_dailink { struct sof_sdw_dailink {
...@@ -1529,7 +1529,7 @@ static int parse_sdw_endpoints(struct snd_soc_card *card, ...@@ -1529,7 +1529,7 @@ static int parse_sdw_endpoints(struct snd_soc_card *card,
for (i = 0; i < adr_link->num_adr; i++) { for (i = 0; i < adr_link->num_adr; i++) {
const struct snd_soc_acpi_adr_device *adr_dev = &adr_link->adr_d[i]; const struct snd_soc_acpi_adr_device *adr_dev = &adr_link->adr_d[i];
struct sof_sdw_codec_info *codec_info; struct asoc_sdw_codec_info *codec_info;
const char *codec_name; const char *codec_name;
if (!adr_dev->name_prefix) { if (!adr_dev->name_prefix) {
...@@ -1563,7 +1563,7 @@ static int parse_sdw_endpoints(struct snd_soc_card *card, ...@@ -1563,7 +1563,7 @@ static int parse_sdw_endpoints(struct snd_soc_card *card,
for (j = 0; j < adr_dev->num_endpoints; j++) { for (j = 0; j < adr_dev->num_endpoints; j++) {
const struct snd_soc_acpi_endpoint *adr_end; const struct snd_soc_acpi_endpoint *adr_end;
const struct sof_sdw_dai_info *dai_info; const struct asoc_sdw_dai_info *dai_info;
struct sof_sdw_dailink *sof_dai; struct sof_sdw_dailink *sof_dai;
int stream; int stream;
...@@ -1790,7 +1790,7 @@ static int create_sdw_dailinks(struct snd_soc_card *card, ...@@ -1790,7 +1790,7 @@ static int create_sdw_dailinks(struct snd_soc_card *card,
static int create_ssp_dailinks(struct snd_soc_card *card, static int create_ssp_dailinks(struct snd_soc_card *card,
struct snd_soc_dai_link **dai_links, int *be_id, struct snd_soc_dai_link **dai_links, int *be_id,
struct sof_sdw_codec_info *ssp_info, struct asoc_sdw_codec_info *ssp_info,
unsigned long ssp_mask) unsigned long ssp_mask)
{ {
struct device *dev = card->dev; struct device *dev = card->dev;
...@@ -1914,7 +1914,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) ...@@ -1914,7 +1914,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card)
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
struct snd_soc_acpi_mach_params *mach_params = &mach->mach_params; struct snd_soc_acpi_mach_params *mach_params = &mach->mach_params;
struct snd_soc_codec_conf *codec_conf; struct snd_soc_codec_conf *codec_conf;
struct sof_sdw_codec_info *ssp_info; struct asoc_sdw_codec_info *ssp_info;
struct sof_sdw_endpoint *sof_ends; struct sof_sdw_endpoint *sof_ends;
struct sof_sdw_dailink *sof_dais; struct sof_sdw_dailink *sof_dais;
int num_devs = 0; int num_devs = 0;
......
sound/soc/intel/boards/sof_sdw_common.h
View file @ 6588fcc8
...@@ -79,9 +79,9 @@ enum { ...@@ -79,9 +79,9 @@ enum {
#define SOF_SDW_MAX_DAI_NUM 8 #define SOF_SDW_MAX_DAI_NUM 8
struct sof_sdw_codec_info; struct asoc_sdw_codec_info;
struct sof_sdw_dai_info { struct asoc_sdw_dai_info {
const bool direction[2]; /* playback & capture support */ const bool direction[2]; /* playback & capture support */
const char *dai_name; const char *dai_name;
const int dai_type; const int dai_type;
...@@ -92,7 +92,7 @@ struct sof_sdw_dai_info { ...@@ -92,7 +92,7 @@ struct sof_sdw_dai_info {
const int num_widgets; const int num_widgets;
int (*init)(struct snd_soc_card *card, int (*init)(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct sof_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback); bool playback);
int (*exit)(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link); int (*exit)(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
int (*rtd_init)(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int (*rtd_init)(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
...@@ -100,7 +100,7 @@ struct sof_sdw_dai_info { ...@@ -100,7 +100,7 @@ struct sof_sdw_dai_info {
unsigned long quirk; unsigned long quirk;
}; };
struct sof_sdw_codec_info { struct asoc_sdw_codec_info {
const int part_id; const int part_id;
const int version_id; const int version_id;
const char *codec_name; const char *codec_name;
...@@ -108,7 +108,7 @@ struct sof_sdw_codec_info { ...@@ -108,7 +108,7 @@ struct sof_sdw_codec_info {
const u8 acpi_id[ACPI_ID_LEN]; const u8 acpi_id[ACPI_ID_LEN];
const bool ignore_pch_dmic; const bool ignore_pch_dmic;
const struct snd_soc_ops *ops; const struct snd_soc_ops *ops;
struct sof_sdw_dai_info dais[SOF_SDW_MAX_DAI_NUM]; struct asoc_sdw_dai_info dais[SOF_SDW_MAX_DAI_NUM];
const int dai_num; const int dai_num;
int (*codec_card_late_probe)(struct snd_soc_card *card); int (*codec_card_late_probe)(struct snd_soc_card *card);
...@@ -153,14 +153,14 @@ int sof_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd); ...@@ -153,14 +153,14 @@ int sof_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);
/* RT711 support */ /* RT711 support */
int sof_sdw_rt711_init(struct snd_soc_card *card, int sof_sdw_rt711_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct sof_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback); bool playback);
int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link); int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
/* RT711-SDCA support */ /* RT711-SDCA support */
int sof_sdw_rt_sdca_jack_init(struct snd_soc_card *card, int sof_sdw_rt_sdca_jack_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct sof_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback); bool playback);
int sof_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link); int sof_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
...@@ -170,20 +170,20 @@ extern const struct snd_soc_ops sof_sdw_rt1308_i2s_ops; ...@@ -170,20 +170,20 @@ extern const struct snd_soc_ops sof_sdw_rt1308_i2s_ops;
/* generic amp support */ /* generic amp support */
int sof_sdw_rt_amp_init(struct snd_soc_card *card, int sof_sdw_rt_amp_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct sof_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback); bool playback);
int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link); int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
/* MAXIM codec support */ /* MAXIM codec support */
int sof_sdw_maxim_init(struct snd_soc_card *card, int sof_sdw_maxim_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct sof_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback); bool playback);
/* CS42L43 support */ /* CS42L43 support */
int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card, int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct sof_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback); bool playback);
/* CS AMP support */ /* CS AMP support */
...@@ -194,12 +194,12 @@ int bridge_cs35l56_add_sidecar(struct snd_soc_card *card, ...@@ -194,12 +194,12 @@ int bridge_cs35l56_add_sidecar(struct snd_soc_card *card,
struct snd_soc_codec_conf **codec_conf); struct snd_soc_codec_conf **codec_conf);
int bridge_cs35l56_spk_init(struct snd_soc_card *card, int bridge_cs35l56_spk_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct sof_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback); bool playback);
int sof_sdw_cs_amp_init(struct snd_soc_card *card, int sof_sdw_cs_amp_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct sof_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback); bool playback);
/* dai_link init callbacks */ /* dai_link init callbacks */
......
sound/soc/intel/boards/sof_sdw_cs42l43.c
View file @ 6588fcc8
...@@ -123,7 +123,7 @@ int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *da ...@@ -123,7 +123,7 @@ int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *da
int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card, int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct sof_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback) bool playback)
{ {
/* Do init on playback link only. */ /* Do init on playback link only. */
......
sound/soc/intel/boards/sof_sdw_cs_amp.c
View file @ 6588fcc8
...@@ -47,7 +47,7 @@ int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) ...@@ -47,7 +47,7 @@ int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
int sof_sdw_cs_amp_init(struct snd_soc_card *card, int sof_sdw_cs_amp_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct sof_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback) bool playback)
{ {
/* Do init on playback link only. */ /* Do init on playback link only. */
......
sound/soc/intel/boards/sof_sdw_maxim.c
View file @ 6588fcc8
...@@ -120,7 +120,7 @@ static int mx8373_sdw_late_probe(struct snd_soc_card *card) ...@@ -120,7 +120,7 @@ static int mx8373_sdw_late_probe(struct snd_soc_card *card)
int sof_sdw_maxim_init(struct snd_soc_card *card, int sof_sdw_maxim_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct sof_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback) bool playback)
{ {
info->amp_num++; info->amp_num++;
......
sound/soc/intel/boards/sof_sdw_rt711.c
View file @ 6588fcc8
...@@ -126,7 +126,7 @@ int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_l ...@@ -126,7 +126,7 @@ int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_l
int sof_sdw_rt711_init(struct snd_soc_card *card, int sof_sdw_rt711_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct sof_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback) bool playback)
{ {
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
......
sound/soc/intel/boards/sof_sdw_rt_amp.c
View file @ 6588fcc8
...@@ -256,7 +256,7 @@ int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_ ...@@ -256,7 +256,7 @@ int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_
int sof_sdw_rt_amp_init(struct snd_soc_card *card, int sof_sdw_rt_amp_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct sof_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback) bool playback)
{ {
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
......
sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c
View file @ 6588fcc8
...@@ -180,7 +180,7 @@ int sof_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link ...@@ -180,7 +180,7 @@ int sof_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link
int sof_sdw_rt_sdca_jack_init(struct snd_soc_card *card, int sof_sdw_rt_sdca_jack_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct sof_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback) bool playback)
{ {
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7