Commit 168bfa96 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: Intel: kbl_rt5660: 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 avatarMark Brown <broonie@kernel.org>
parent 5ae4641f
...@@ -317,78 +317,101 @@ static const struct snd_soc_ops kabylake_rt5660_fe_ops = { ...@@ -317,78 +317,101 @@ static const struct snd_soc_ops kabylake_rt5660_fe_ops = {
.startup = kbl_fe_startup, .startup = kbl_fe_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(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(COMP_CODEC("i2c-10EC3277:00", KBL_RT5660_CODEC_DAI)));
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")));
/* kabylake digital audio interface glue - connects rt5660 codec <--> CPU */ /* kabylake digital audio interface glue - connects rt5660 codec <--> CPU */
static struct snd_soc_dai_link kabylake_rt5660_dais[] = { static struct snd_soc_dai_link kabylake_rt5660_dais[] = {
/* Front End DAI links */ /* Front End DAI links */
[KBL_DPCM_AUDIO_PB] = { [KBL_DPCM_AUDIO_PB] = {
.name = "Kbl Audio Port", .name = "Kbl 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,
.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 = &kabylake_rt5660_fe_ops, .ops = &kabylake_rt5660_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
}, },
[KBL_DPCM_AUDIO_CP] = { [KBL_DPCM_AUDIO_CP] = {
.name = "Kbl Audio Capture Port", .name = "Kbl 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 = &kabylake_rt5660_fe_ops, .ops = &kabylake_rt5660_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
}, },
[KBL_DPCM_AUDIO_HDMI1_PB] = { [KBL_DPCM_AUDIO_HDMI1_PB] = {
.name = "Kbl HDMI Port1", .name = "Kbl 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),
}, },
[KBL_DPCM_AUDIO_HDMI2_PB] = { [KBL_DPCM_AUDIO_HDMI2_PB] = {
.name = "Kbl HDMI Port2", .name = "Kbl 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),
}, },
[KBL_DPCM_AUDIO_HDMI3_PB] = { [KBL_DPCM_AUDIO_HDMI3_PB] = {
.name = "Kbl HDMI Port3", .name = "Kbl 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 */
...@@ -396,11 +419,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { ...@@ -396,11 +419,7 @@ static struct snd_soc_dai_link kabylake_rt5660_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,
.codec_name = "i2c-10EC3277:00",
.codec_dai_name = KBL_RT5660_CODEC_DAI,
.init = kabylake_rt5660_codec_init, .init = kabylake_rt5660_codec_init,
.dai_fmt = SND_SOC_DAIFMT_I2S | .dai_fmt = SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
...@@ -410,39 +429,31 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { ...@@ -410,39 +429,31 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = {
.ops = &kabylake_rt5660_ops, .ops = &kabylake_rt5660_ops,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform),
}, },
{ {
.name = "iDisp1", .name = "iDisp1",
.id = 1, .id = 1,
.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 = kabylake_hdmi1_init, .init = kabylake_hdmi1_init,
.no_pcm = 1, .no_pcm = 1,
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
}, },
{ {
.name = "iDisp2", .name = "iDisp2",
.id = 2, .id = 2,
.cpu_dai_name = "iDisp2 Pin",
.codec_name = "ehdaudio0D2",
.codec_dai_name = "intel-hdmi-hifi2",
.platform_name = "0000:00:1f.3",
.init = kabylake_hdmi2_init, .init = kabylake_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 = 3, .id = 3,
.cpu_dai_name = "iDisp3 Pin",
.codec_name = "ehdaudio0D2",
.codec_dai_name = "intel-hdmi-hifi3",
.platform_name = "0000:00:1f.3",
.init = kabylake_hdmi3_init, .init = kabylake_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