Skip to content

Use inclusive language for DSP cores #2415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kv2019i merged 3 commits into from
Sep 2, 2020
Merged

Use inclusive language for DSP cores #2415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7820f85
squashme! ASoC: SOF: support topology components on primary cores
plbossart Sep 1, 2020
605df37
squashme! ASoC: SOF: support topology components on secondary cores
plbossart Sep 1, 2020
42e4334
ASoC: SOF: Intel: hda-loader: s/master/primary
plbossart Sep 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sound/soc/sof/intel/hda-loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/sof/sof-priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/sof/topology.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down