Commit e42b1945 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown

ASoC: SOF: Intel: add namespaces for BAYTRAIL and MERRIFIELD

Define separate namespaces and include them in ACPI and PCI top-level
modules.
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191217202231.18259-3-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent f4483a0f
...@@ -619,13 +619,13 @@ const struct snd_sof_dsp_ops sof_tng_ops = { ...@@ -619,13 +619,13 @@ const struct snd_sof_dsp_ops sof_tng_ops = {
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_BATCH, SNDRV_PCM_INFO_BATCH,
}; };
EXPORT_SYMBOL(sof_tng_ops); EXPORT_SYMBOL_NS(sof_tng_ops, SND_SOC_SOF_MERRIFIELD);
const struct sof_intel_dsp_desc tng_chip_info = { const struct sof_intel_dsp_desc tng_chip_info = {
.cores_num = 1, .cores_num = 1,
.cores_mask = 1, .cores_mask = 1,
}; };
EXPORT_SYMBOL(tng_chip_info); EXPORT_SYMBOL_NS(tng_chip_info, SND_SOC_SOF_MERRIFIELD);
#endif /* CONFIG_SND_SOC_SOF_MERRIFIELD */ #endif /* CONFIG_SND_SOC_SOF_MERRIFIELD */
...@@ -793,13 +793,13 @@ const struct snd_sof_dsp_ops sof_byt_ops = { ...@@ -793,13 +793,13 @@ const struct snd_sof_dsp_ops sof_byt_ops = {
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_BATCH, SNDRV_PCM_INFO_BATCH,
}; };
EXPORT_SYMBOL(sof_byt_ops); EXPORT_SYMBOL_NS(sof_byt_ops, SND_SOC_SOF_BAYTRAIL);
const struct sof_intel_dsp_desc byt_chip_info = { const struct sof_intel_dsp_desc byt_chip_info = {
.cores_num = 1, .cores_num = 1,
.cores_mask = 1, .cores_mask = 1,
}; };
EXPORT_SYMBOL(byt_chip_info); EXPORT_SYMBOL_NS(byt_chip_info, SND_SOC_SOF_BAYTRAIL);
/* cherrytrail and braswell ops */ /* cherrytrail and braswell ops */
const struct snd_sof_dsp_ops sof_cht_ops = { const struct snd_sof_dsp_ops sof_cht_ops = {
...@@ -866,13 +866,13 @@ const struct snd_sof_dsp_ops sof_cht_ops = { ...@@ -866,13 +866,13 @@ const struct snd_sof_dsp_ops sof_cht_ops = {
SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_BATCH, SNDRV_PCM_INFO_BATCH,
}; };
EXPORT_SYMBOL(sof_cht_ops); EXPORT_SYMBOL_NS(sof_cht_ops, SND_SOC_SOF_BAYTRAIL);
const struct sof_intel_dsp_desc cht_chip_info = { const struct sof_intel_dsp_desc cht_chip_info = {
.cores_num = 1, .cores_num = 1,
.cores_mask = 1, .cores_mask = 1,
}; };
EXPORT_SYMBOL(cht_chip_info); EXPORT_SYMBOL_NS(cht_chip_info, SND_SOC_SOF_BAYTRAIL);
#endif /* CONFIG_SND_SOC_SOF_BAYTRAIL */ #endif /* CONFIG_SND_SOC_SOF_BAYTRAIL */
......
...@@ -240,3 +240,4 @@ static struct platform_driver snd_sof_acpi_driver = { ...@@ -240,3 +240,4 @@ static struct platform_driver snd_sof_acpi_driver = {
module_platform_driver(snd_sof_acpi_driver); module_platform_driver(snd_sof_acpi_driver);
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_IMPORT_NS(SND_SOC_SOF_BAYTRAIL);
...@@ -415,3 +415,4 @@ static struct pci_driver snd_sof_pci_driver = { ...@@ -415,3 +415,4 @@ static struct pci_driver snd_sof_pci_driver = {
module_pci_driver(snd_sof_pci_driver); module_pci_driver(snd_sof_pci_driver);
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_IMPORT_NS(SND_SOC_SOF_MERRIFIELD);
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