Skip to content

L
linux
Commit 502a522b authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files
Options

ASoC: Intel: skl_nau88l25_ssm4567: use modern dai_link style 

ASoC is now supporting modern style dai_link
(= snd_soc_dai_link_component) for CPU/Codec/Platform.
This patch switches to use it.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 27eb6c7c
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 63 deletions
sound/soc/intel/boards/skl_nau88l25_ssm4567.c
View file @ 502a522b
...@@ -164,17 +164,6 @@ static struct snd_soc_codec_conf ssm4567_codec_conf[] = { ...@@ -164,17 +164,6 @@ static struct snd_soc_codec_conf ssm4567_codec_conf[] = {
}, },
}; };
static struct snd_soc_dai_link_component ssm4567_codec_components[] = {
{ /* Left */
.name = "i2c-INT343B:00",
.dai_name = SKL_SSM_CODEC_DAI,
},
{ /* Right */
.name = "i2c-INT343B:01",
.dai_name = SKL_SSM_CODEC_DAI,
},
};
static int skylake_ssm4567_codec_init(struct snd_soc_pcm_runtime *rtd) static int skylake_ssm4567_codec_init(struct snd_soc_pcm_runtime *rtd)
{ {
int ret; int ret;
...@@ -453,105 +442,140 @@ static const struct snd_soc_ops skylake_refcap_ops = { ...@@ -453,105 +442,140 @@ static const struct snd_soc_ops skylake_refcap_ops = {
.startup = skylake_refcap_startup, .startup = skylake_refcap_startup,
}; };
SND_SOC_DAILINK_DEF(dummy,
DAILINK_COMP_ARRAY(COMP_DUMMY()));
SND_SOC_DAILINK_DEF(system,
DAILINK_COMP_ARRAY(COMP_CPU("System Pin")));
SND_SOC_DAILINK_DEF(reference,
DAILINK_COMP_ARRAY(COMP_CPU("Reference Pin")));
SND_SOC_DAILINK_DEF(dmic,
DAILINK_COMP_ARRAY(COMP_CPU("DMIC Pin")));
SND_SOC_DAILINK_DEF(hdmi1,
DAILINK_COMP_ARRAY(COMP_CPU("HDMI1 Pin")));
SND_SOC_DAILINK_DEF(hdmi2,
DAILINK_COMP_ARRAY(COMP_CPU("HDMI2 Pin")));
SND_SOC_DAILINK_DEF(hdmi3,
DAILINK_COMP_ARRAY(COMP_CPU("HDMI3 Pin")));
SND_SOC_DAILINK_DEF(ssp0_pin,
DAILINK_COMP_ARRAY(COMP_CPU("SSP0 Pin")));
SND_SOC_DAILINK_DEF(ssp0_codec,
DAILINK_COMP_ARRAY(
/* Left */ COMP_CODEC("i2c-INT343B:00", SKL_SSM_CODEC_DAI),
/* Right */ COMP_CODEC("i2c-INT343B:01", SKL_SSM_CODEC_DAI)));
SND_SOC_DAILINK_DEF(ssp1_pin,
DAILINK_COMP_ARRAY(COMP_CPU("SSP1 Pin")));
SND_SOC_DAILINK_DEF(ssp1_codec,
DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10508825:00", SKL_NUVOTON_CODEC_DAI)));
SND_SOC_DAILINK_DEF(dmic01_pin,
DAILINK_COMP_ARRAY(COMP_CPU("DMIC01 Pin")));
SND_SOC_DAILINK_DEF(dmic_codec,
DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec", "dmic-hifi")));
SND_SOC_DAILINK_DEF(idisp1_pin,
DAILINK_COMP_ARRAY(COMP_CPU("iDisp1 Pin")));
SND_SOC_DAILINK_DEF(idisp1_codec,
DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi1")));
SND_SOC_DAILINK_DEF(idisp2_pin,
DAILINK_COMP_ARRAY(COMP_CPU("iDisp2 Pin")));
SND_SOC_DAILINK_DEF(idisp2_codec,
DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi2")));
SND_SOC_DAILINK_DEF(idisp3_pin,
DAILINK_COMP_ARRAY(COMP_CPU("iDisp3 Pin")));
SND_SOC_DAILINK_DEF(idisp3_codec,
DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi3")));
SND_SOC_DAILINK_DEF(platform,
DAILINK_COMP_ARRAY(COMP_PLATFORM("0000:00:1f.3")));
/* skylake digital audio interface glue - connects codec <--> CPU */ /* skylake digital audio interface glue - connects codec <--> CPU */
static struct snd_soc_dai_link skylake_dais[] = { static struct snd_soc_dai_link skylake_dais[] = {
/* Front End DAI links */ /* Front End DAI links */
[SKL_DPCM_AUDIO_PB] = { [SKL_DPCM_AUDIO_PB] = {
.name = "Skl Audio Port", .name = "Skl Audio Port",
.stream_name = "Audio", .stream_name = "Audio",
.cpu_dai_name = "System Pin",
.platform_name = "0000:00:1f.3",
.dynamic = 1, .dynamic = 1,
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
.nonatomic = 1, .nonatomic = 1,
.init = skylake_nau8825_fe_init, .init = skylake_nau8825_fe_init,
.trigger = { .trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
.dpcm_playback = 1, .dpcm_playback = 1,
.ops = &skylake_nau8825_fe_ops, .ops = &skylake_nau8825_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
}, },
[SKL_DPCM_AUDIO_CP] = { [SKL_DPCM_AUDIO_CP] = {
.name = "Skl Audio Capture Port", .name = "Skl Audio Capture Port",
.stream_name = "Audio Record", .stream_name = "Audio Record",
.cpu_dai_name = "System Pin",
.platform_name = "0000:00:1f.3",
.dynamic = 1, .dynamic = 1,
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
.nonatomic = 1, .nonatomic = 1,
.trigger = { .trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
.dpcm_capture = 1, .dpcm_capture = 1,
.ops = &skylake_nau8825_fe_ops, .ops = &skylake_nau8825_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
}, },
[SKL_DPCM_AUDIO_REF_CP] = { [SKL_DPCM_AUDIO_REF_CP] = {
.name = "Skl Audio Reference cap", .name = "Skl Audio Reference cap",
.stream_name = "Wake on Voice", .stream_name = "Wake on Voice",
.cpu_dai_name = "Reference Pin",
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
.platform_name = "0000:00:1f.3",
.init = NULL, .init = NULL,
.dpcm_capture = 1, .dpcm_capture = 1,
.nonatomic = 1, .nonatomic = 1,
.dynamic = 1, .dynamic = 1,
.ops = &skylake_refcap_ops, .ops = &skylake_refcap_ops,
SND_SOC_DAILINK_REG(reference, dummy, platform),
}, },
[SKL_DPCM_AUDIO_DMIC_CP] = { [SKL_DPCM_AUDIO_DMIC_CP] = {
.name = "Skl Audio DMIC cap", .name = "Skl Audio DMIC cap",
.stream_name = "dmiccap", .stream_name = "dmiccap",
.cpu_dai_name = "DMIC Pin",
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
.platform_name = "0000:00:1f.3",
.init = NULL, .init = NULL,
.dpcm_capture = 1, .dpcm_capture = 1,
.nonatomic = 1, .nonatomic = 1,
.dynamic = 1, .dynamic = 1,
.ops = &skylake_dmic_ops, .ops = &skylake_dmic_ops,
SND_SOC_DAILINK_REG(dmic, dummy, platform),
}, },
[SKL_DPCM_AUDIO_HDMI1_PB] = { [SKL_DPCM_AUDIO_HDMI1_PB] = {
.name = "Skl HDMI Port1", .name = "Skl HDMI Port1",
.stream_name = "Hdmi1", .stream_name = "Hdmi1",
.cpu_dai_name = "HDMI1 Pin",
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
.platform_name = "0000:00:1f.3",
.dpcm_playback = 1, .dpcm_playback = 1,
.init = NULL, .init = NULL,
.trigger = { .trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
.nonatomic = 1, .nonatomic = 1,
.dynamic = 1, .dynamic = 1,
SND_SOC_DAILINK_REG(hdmi1, dummy, platform),
}, },
[SKL_DPCM_AUDIO_HDMI2_PB] = { [SKL_DPCM_AUDIO_HDMI2_PB] = {
.name = "Skl HDMI Port2", .name = "Skl HDMI Port2",
.stream_name = "Hdmi2", .stream_name = "Hdmi2",
.cpu_dai_name = "HDMI2 Pin",
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
.platform_name = "0000:00:1f.3",
.dpcm_playback = 1, .dpcm_playback = 1,
.init = NULL, .init = NULL,
.trigger = { .trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
.nonatomic = 1, .nonatomic = 1,
.dynamic = 1, .dynamic = 1,
SND_SOC_DAILINK_REG(hdmi2, dummy, platform),
}, },
[SKL_DPCM_AUDIO_HDMI3_PB] = { [SKL_DPCM_AUDIO_HDMI3_PB] = {
.name = "Skl HDMI Port3", .name = "Skl HDMI Port3",
.stream_name = "Hdmi3", .stream_name = "Hdmi3",
.cpu_dai_name = "HDMI3 Pin",
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
.platform_name = "0000:00:1f.3",
.trigger = { .trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
.dpcm_playback = 1, .dpcm_playback = 1,
.init = NULL, .init = NULL,
.nonatomic = 1, .nonatomic = 1,
.dynamic = 1, .dynamic = 1,
SND_SOC_DAILINK_REG(hdmi3, dummy, platform),
}, },
/* Back End DAI links */ /* Back End DAI links */
...@@ -559,11 +583,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -559,11 +583,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
/* SSP0 - Codec */ /* SSP0 - Codec */
.name = "SSP0-Codec", .name = "SSP0-Codec",
.id = 0, .id = 0,
.cpu_dai_name = "SSP0 Pin",
.platform_name = "0000:00:1f.3",
.no_pcm = 1, .no_pcm = 1,
.codecs = ssm4567_codec_components,
.num_codecs = ARRAY_SIZE(ssm4567_codec_components),
.dai_fmt = SND_SOC_DAIFMT_DSP_A | .dai_fmt = SND_SOC_DAIFMT_DSP_A |
SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_IB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBS_CFS,
...@@ -572,16 +592,13 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -572,16 +592,13 @@ static struct snd_soc_dai_link skylake_dais[] = {
.be_hw_params_fixup = skylake_ssp_fixup, .be_hw_params_fixup = skylake_ssp_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform),
}, },
{ {
/* SSP1 - Codec */ /* SSP1 - Codec */
.name = "SSP1-Codec", .name = "SSP1-Codec",
.id = 1, .id = 1,
.cpu_dai_name = "SSP1 Pin",
.platform_name = "0000:00:1f.3",
.no_pcm = 1, .no_pcm = 1,
.codec_name = "i2c-10508825:00",
.codec_dai_name = SKL_NUVOTON_CODEC_DAI,
.init = skylake_nau8825_codec_init, .init = skylake_nau8825_codec_init,
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBS_CFS,
...@@ -590,51 +607,40 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -590,51 +607,40 @@ static struct snd_soc_dai_link skylake_dais[] = {
.ops = &skylake_nau8825_ops, .ops = &skylake_nau8825_ops,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform),
}, },
{ {
.name = "dmic01", .name = "dmic01",
.id = 2, .id = 2,
.cpu_dai_name = "DMIC01 Pin",
.codec_name = "dmic-codec",
.codec_dai_name = "dmic-hifi",
.platform_name = "0000:00:1f.3",
.ignore_suspend = 1, .ignore_suspend = 1,
.be_hw_params_fixup = skylake_dmic_fixup, .be_hw_params_fixup = skylake_dmic_fixup,
.dpcm_capture = 1, .dpcm_capture = 1,
.no_pcm = 1, .no_pcm = 1,
SND_SOC_DAILINK_REG(dmic01_pin, dmic_codec, platform),
}, },
{ {
.name = "iDisp1", .name = "iDisp1",
.id = 3, .id = 3,
.cpu_dai_name = "iDisp1 Pin",
.codec_name = "ehdaudio0D2",
.codec_dai_name = "intel-hdmi-hifi1",
.platform_name = "0000:00:1f.3",
.dpcm_playback = 1, .dpcm_playback = 1,
.init = skylake_hdmi1_init, .init = skylake_hdmi1_init,
.no_pcm = 1, .no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
}, },
{ {
.name = "iDisp2", .name = "iDisp2",
.id = 4, .id = 4,
.cpu_dai_name = "iDisp2 Pin",
.codec_name = "ehdaudio0D2",
.codec_dai_name = "intel-hdmi-hifi2",
.platform_name = "0000:00:1f.3",
.init = skylake_hdmi2_init, .init = skylake_hdmi2_init,
.dpcm_playback = 1, .dpcm_playback = 1,
.no_pcm = 1, .no_pcm = 1,
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
}, },
{ {
.name = "iDisp3", .name = "iDisp3",
.id = 5, .id = 5,
.cpu_dai_name = "iDisp3 Pin",
.codec_name = "ehdaudio0D2",
.codec_dai_name = "intel-hdmi-hifi3",
.platform_name = "0000:00:1f.3",
.init = skylake_hdmi3_init, .init = skylake_hdmi3_init,
.dpcm_playback = 1, .dpcm_playback = 1,
.no_pcm = 1, .no_pcm = 1,
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
}, },
}; };
......
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