Commit e8f34882 authored by Brent Lu's avatar Brent Lu Committed by Mark Brown

ASoC: Intel: sof_nau8825: use nuvoton-common module

Use nuvoton-common module to support nau8318 speaker amplifier.
Signed-off-by: default avatarBrent Lu <brent.lu@intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230915124852.1696857-15-yung-chuan.liao@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent e82907e7
...@@ -568,6 +568,7 @@ config SND_SOC_INTEL_SOF_NAU8825_MACH ...@@ -568,6 +568,7 @@ config SND_SOC_INTEL_SOF_NAU8825_MACH
select SND_SOC_HDAC_HDMI select SND_SOC_HDAC_HDMI
select SND_SOC_INTEL_HDA_DSP_COMMON select SND_SOC_INTEL_HDA_DSP_COMMON
select SND_SOC_INTEL_SOF_MAXIM_COMMON select SND_SOC_INTEL_SOF_MAXIM_COMMON
select SND_SOC_INTEL_SOF_NUVOTON_COMMON
select SND_SOC_INTEL_SOF_REALTEK_COMMON select SND_SOC_INTEL_SOF_REALTEK_COMMON
select SND_SOC_INTEL_SOF_SSP_COMMON select SND_SOC_INTEL_SOF_SSP_COMMON
help help
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "hda_dsp_common.h" #include "hda_dsp_common.h"
#include "sof_realtek_common.h" #include "sof_realtek_common.h"
#include "sof_maxim_common.h" #include "sof_maxim_common.h"
#include "sof_nuvoton_common.h"
#include "sof_ssp_common.h" #include "sof_ssp_common.h"
#define NAME_SIZE 32 #define NAME_SIZE 32
...@@ -336,13 +337,6 @@ static struct snd_soc_dai_link_component rt1019p_component[] = { ...@@ -336,13 +337,6 @@ static struct snd_soc_dai_link_component rt1019p_component[] = {
} }
}; };
static struct snd_soc_dai_link_component nau8318_components[] = {
{
.name = "NVTN2012:00",
.dai_name = "nau8315-hifi",
}
};
static struct snd_soc_dai_link * static struct snd_soc_dai_link *
sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type, sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type,
int ssp_codec, int ssp_amp, int dmic_be_num, int ssp_codec, int ssp_amp, int dmic_be_num,
...@@ -478,9 +472,7 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type, ...@@ -478,9 +472,7 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type,
links[id].ops = &max_98373_ops; links[id].ops = &max_98373_ops;
break; break;
case CODEC_NAU8318: case CODEC_NAU8318:
links[id].codecs = nau8318_components; nau8318_set_dai_link(&links[id]);
links[id].num_codecs = ARRAY_SIZE(nau8318_components);
links[id].init = speaker_codec_init;
break; break;
case CODEC_RT1015P: case CODEC_RT1015P:
sof_rt1015p_dai_link(&links[id]); sof_rt1015p_dai_link(&links[id]);
...@@ -715,5 +707,6 @@ MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>"); ...@@ -715,5 +707,6 @@ MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON); MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);
MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_MAXIM_COMMON); MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_MAXIM_COMMON);
MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_NUVOTON_COMMON);
MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_REALTEK_COMMON); MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_REALTEK_COMMON);
MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_SSP_COMMON); MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_SSP_COMMON);
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