From 7820f851e0a314906595147a628f4d1595b18886 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Tue, 1 Sep 2020 18:09:34 -0500 Subject: [PATCH 1/3] squashme! ASoC: SOF: support topology components on primary cores Need to rewrite commit message with 'primary' instead of 'master' Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/sof-priv.h | 4 ++-- sound/soc/sof/topology.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h index ff0f3cd173af07..0aed2a7ab85809 100644 --- a/sound/soc/sof/sof-priv.h +++ b/sound/soc/sof/sof-priv.h @@ -54,8 +54,8 @@ extern int sof_core_debug; (IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_ENABLE_DEBUGFS_CACHE) || \ IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST)) -/* So far the master core on all DSPs has ID 0 */ -#define SOF_DSP_MASTER_CORE 0 +/* So far the primary core on all DSPs has ID 0 */ +#define SOF_DSP_PRIMARY_CORE 0 /* DSP power state */ enum sof_dsp_power_states { diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 1849178c8b624c..6e0de9cf51eb39 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -2388,7 +2388,7 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, struct sof_ipc_comp_reply reply; struct snd_sof_control *scontrol; struct sof_ipc_comp comp = { - .core = SOF_DSP_MASTER_CORE, + .core = SOF_DSP_PRIMARY_CORE, }; int ret = 0; From 605df37ba3884b4dd05d27b745c7131b3d3b894d Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Tue, 1 Sep 2020 18:11:26 -0500 Subject: [PATCH 2/3] squashme! ASoC: SOF: support topology components on secondary cores Need to rewrite commit message to replace 'slave' by 'secondary' Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 6e0de9cf51eb39..eaa1122d5a6836 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -2422,7 +2422,7 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, swidget->core = comp.core; - /* default is master core, safe to call for already enabled cores */ + /* default is primary core, safe to call for already enabled cores */ ret = sof_core_enable(sdev, comp.core); if (ret < 0) { dev_err(scomp->dev, "error: enable core: %d\n", ret); From 42e4334b8af468778b3b8f230c6d0bae1dc2f596 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Tue, 1 Sep 2020 18:14:14 -0500 Subject: [PATCH 3/3] ASoC: SOF: Intel: hda-loader: s/master/primary Use inclusive language for DSP cores. Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/intel/hda-loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c index f286391c9486f9..2707a16c6a4d3d 100644 --- a/sound/soc/sof/intel/hda-loader.c +++ b/sound/soc/sof/intel/hda-loader.c @@ -428,7 +428,7 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) } /* - * return master core id if both fw copy + * return primary core id if both fw copy * and stream clean up are successful */ if (!ret)