Skip to content

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

ASoC: Intel: kbl_da7219_max98927: 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 42ac21b9
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 122 deletions
sound/soc/intel/boards/kbl_da7219_max98927.c
View file @ bf2a8ebd
...@@ -594,19 +594,6 @@ static struct snd_soc_codec_conf max98373_codec_conf[] = { ...@@ -594,19 +594,6 @@ static struct snd_soc_codec_conf max98373_codec_conf[] = {
}, },
}; };
static struct snd_soc_dai_link_component max98927_ssp0_codec_components[] = {
{ /* Left */
.name = MAX98927_DEV0_NAME,
.dai_name = MAX98927_CODEC_DAI,
},
{ /* For Right */
.name = MAX98927_DEV1_NAME,
.dai_name = MAX98927_CODEC_DAI,
},
};
static struct snd_soc_dai_link_component max98373_ssp0_codec_components[] = { static struct snd_soc_dai_link_component max98373_ssp0_codec_components[] = {
{ /* Left */ { /* Left */
.name = MAX98373_DEV0_NAME, .name = MAX98373_DEV0_NAME,
...@@ -620,110 +607,148 @@ static struct snd_soc_dai_link_component max98373_ssp0_codec_components[] = { ...@@ -620,110 +607,148 @@ static struct snd_soc_dai_link_component max98373_ssp0_codec_components[] = {
}; };
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(echoref,
DAILINK_COMP_ARRAY(COMP_CPU("Echoref 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(system2,
DAILINK_COMP_ARRAY(COMP_CPU("System Pin2")));
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(MAX98927_DEV0_NAME, MAX98927_CODEC_DAI),
/* For Right */ COMP_CODEC(MAX98927_DEV1_NAME, MAX98927_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-DLGS7219:00",
KBL_DIALOG_CODEC_DAI)));
SND_SOC_DAILINK_DEF(dmic_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")));
/* kabylake digital audio interface glue - connects codec <--> CPU */ /* kabylake digital audio interface glue - connects codec <--> CPU */
static struct snd_soc_dai_link kabylake_dais[] = { static struct snd_soc_dai_link kabylake_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,
.init = kabylake_da7219_fe_init, .init = kabylake_da7219_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 = &kabylake_da7219_fe_ops, .ops = &kabylake_da7219_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
}, },
[KBL_DPCM_AUDIO_ECHO_REF_CP] = { [KBL_DPCM_AUDIO_ECHO_REF_CP] = {
.name = "Kbl Audio Echo Reference cap", .name = "Kbl Audio Echo Reference cap",
.stream_name = "Echoreference Capture", .stream_name = "Echoreference Capture",
.cpu_dai_name = "Echoref Pin",
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
.platform_name = "0000:00:1f.3",
.init = NULL, .init = NULL,
.capture_only = 1, .capture_only = 1,
.nonatomic = 1, .nonatomic = 1,
SND_SOC_DAILINK_REG(echoref, dummy, platform),
}, },
[KBL_DPCM_AUDIO_REF_CP] = { [KBL_DPCM_AUDIO_REF_CP] = {
.name = "Kbl Audio Reference cap", .name = "Kbl 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),
}, },
[KBL_DPCM_AUDIO_DMIC_CP] = { [KBL_DPCM_AUDIO_DMIC_CP] = {
.name = "Kbl Audio DMIC cap", .name = "Kbl 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 = &kabylake_dmic_ops, .ops = &kabylake_dmic_ops,
SND_SOC_DAILINK_REG(dmic, 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),
}, },
[KBL_DPCM_AUDIO_HS_PB] = { [KBL_DPCM_AUDIO_HS_PB] = {
.name = "Kbl Audio Headset Playback", .name = "Kbl Audio Headset Playback",
.stream_name = "Headset Audio", .stream_name = "Headset Audio",
.cpu_dai_name = "System Pin2",
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
.platform_name = "0000:00:1f.3",
.dpcm_playback = 1, .dpcm_playback = 1,
.nonatomic = 1, .nonatomic = 1,
.dynamic = 1, .dynamic = 1,
...@@ -731,21 +756,18 @@ static struct snd_soc_dai_link kabylake_dais[] = { ...@@ -731,21 +756,18 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.trigger = { .trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
.ops = &kabylake_da7219_fe_ops, .ops = &kabylake_da7219_fe_ops,
SND_SOC_DAILINK_REG(system2, 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_da7219_fe_ops, .ops = &kabylake_da7219_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
}, },
/* Back End DAI links */ /* Back End DAI links */
...@@ -753,11 +775,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { ...@@ -753,11 +775,7 @@ static struct snd_soc_dai_link kabylake_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 = max98927_ssp0_codec_components,
.num_codecs = ARRAY_SIZE(max98927_ssp0_codec_components),
.dai_fmt = SND_SOC_DAIFMT_DSP_B | .dai_fmt = SND_SOC_DAIFMT_DSP_B |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBS_CFS,
...@@ -766,16 +784,13 @@ static struct snd_soc_dai_link kabylake_dais[] = { ...@@ -766,16 +784,13 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup, .be_hw_params_fixup = kabylake_ssp_fixup,
.ops = &kabylake_ssp0_ops, .ops = &kabylake_ssp0_ops,
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-DLGS7219:00",
.codec_dai_name = KBL_DIALOG_CODEC_DAI,
.init = kabylake_da7219_codec_init, .init = kabylake_da7219_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,
...@@ -783,52 +798,41 @@ static struct snd_soc_dai_link kabylake_dais[] = { ...@@ -783,52 +798,41 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.be_hw_params_fixup = kabylake_ssp_fixup, .be_hw_params_fixup = kabylake_ssp_fixup,
.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",
.init = kabylake_dmic_init, .init = kabylake_dmic_init,
.platform_name = "0000:00:1f.3",
.be_hw_params_fixup = kabylake_dmic_fixup, .be_hw_params_fixup = kabylake_dmic_fixup,
.ignore_suspend = 1, .ignore_suspend = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
.no_pcm = 1, .no_pcm = 1,
SND_SOC_DAILINK_REG(dmic_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 = 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 = 4, .id = 4,
.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 = 5, .id = 5,
.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),
}, },
}; };
...@@ -838,96 +842,75 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { ...@@ -838,96 +842,75 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
[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,
.init = kabylake_da7219_fe_init, .init = kabylake_da7219_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 = &kabylake_da7219_fe_ops, .ops = &kabylake_da7219_fe_ops,
SND_SOC_DAILINK_REG(system, dummy, platform),
}, },
[KBL_DPCM_AUDIO_ECHO_REF_CP] = { [KBL_DPCM_AUDIO_ECHO_REF_CP] = {
.name = "Kbl Audio Echo Reference cap", .name = "Kbl Audio Echo Reference cap",
.stream_name = "Echoreference Capture", .stream_name = "Echoreference Capture",
.cpu_dai_name = "Echoref Pin",
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
.platform_name = "0000:00:1f.3",
.init = NULL, .init = NULL,
.capture_only = 1, .capture_only = 1,
.nonatomic = 1, .nonatomic = 1,
SND_SOC_DAILINK_REG(echoref, dummy, platform),
}, },
[KBL_DPCM_AUDIO_REF_CP] = { [KBL_DPCM_AUDIO_REF_CP] = {
.name = "Kbl Audio Reference cap", .name = "Kbl 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),
}, },
[KBL_DPCM_AUDIO_DMIC_CP] = { [KBL_DPCM_AUDIO_DMIC_CP] = {
.name = "Kbl Audio DMIC cap", .name = "Kbl 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 = &kabylake_dmic_ops, .ops = &kabylake_dmic_ops,
SND_SOC_DAILINK_REG(dmic, 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 */
...@@ -935,11 +918,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { ...@@ -935,11 +918,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_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 = max98927_ssp0_codec_components,
.num_codecs = ARRAY_SIZE(max98927_ssp0_codec_components),
.dai_fmt = SND_SOC_DAIFMT_DSP_B | .dai_fmt = SND_SOC_DAIFMT_DSP_B |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBS_CFS,
...@@ -948,52 +927,41 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { ...@@ -948,52 +927,41 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup, .be_hw_params_fixup = kabylake_ssp_fixup,
.ops = &kabylake_ssp0_ops, .ops = &kabylake_ssp0_ops,
SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec),
}, },
{ {
.name = "dmic01", .name = "dmic01",
.id = 1, .id = 1,
.cpu_dai_name = "DMIC01 Pin",
.codec_name = "dmic-codec",
.codec_dai_name = "dmic-hifi",
.init = kabylake_dmic_init, .init = kabylake_dmic_init,
.platform_name = "0000:00:1f.3",
.be_hw_params_fixup = kabylake_dmic_fixup, .be_hw_params_fixup = kabylake_dmic_fixup,
.ignore_suspend = 1, .ignore_suspend = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
.no_pcm = 1, .no_pcm = 1,
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
}, },
{ {
.name = "iDisp1", .name = "iDisp1",
.id = 2, .id = 2,
.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 = 3, .id = 3,
.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 = 4, .id = 4,
.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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7