diff options
| author | Fang, Yang A <yang.a.fang@intel.com> | 2015-12-11 14:29:13 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-12-18 03:29:04 -0500 |
| commit | 743ad80e5c8565ab54e8832f6d74cb543a0adbba (patch) | |
| tree | 290a10dae99c19fdb597eb0f35d34e2a67a6f5c8 /sound/soc/intel/boards | |
| parent | 2154be362c9050b9ed5d3beac491f0103505bf16 (diff) | |
ASoc: Intel: boards: Add HDMI/DP links for nau88l25_ssm4567 machine
This machine supports HDMI/DP ports so add these ports and its FE and BE
DAIlinks
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Fang, Yang A <yang.a.fang@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/boards')
| -rw-r--r-- | sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c index f6c252cccdb4..c071812f31e5 100644 --- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c +++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c | |||
| @@ -93,6 +93,8 @@ static const struct snd_soc_dapm_widget skylake_widgets[] = { | |||
| 93 | SND_SOC_DAPM_SPK("Right Speaker", NULL), | 93 | SND_SOC_DAPM_SPK("Right Speaker", NULL), |
| 94 | SND_SOC_DAPM_MIC("SoC DMIC", NULL), | 94 | SND_SOC_DAPM_MIC("SoC DMIC", NULL), |
| 95 | SND_SOC_DAPM_SINK("WoV Sink"), | 95 | SND_SOC_DAPM_SINK("WoV Sink"), |
| 96 | SND_SOC_DAPM_SPK("DP", NULL), | ||
| 97 | SND_SOC_DAPM_SPK("HDMI", NULL), | ||
| 96 | SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0, | 98 | SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0, |
| 97 | platform_clock_control, SND_SOC_DAPM_PRE_PMU | | 99 | platform_clock_control, SND_SOC_DAPM_PRE_PMU | |
| 98 | SND_SOC_DAPM_POST_PMD), | 100 | SND_SOC_DAPM_POST_PMD), |
| @@ -112,6 +114,9 @@ static const struct snd_soc_dapm_route skylake_map[] = { | |||
| 112 | {"DMic", NULL, "SoC DMIC"}, | 114 | {"DMic", NULL, "SoC DMIC"}, |
| 113 | 115 | ||
| 114 | {"WoV Sink", NULL, "hwd_in sink"}, | 116 | {"WoV Sink", NULL, "hwd_in sink"}, |
| 117 | |||
| 118 | {"HDMI", NULL, "hif5 Output"}, | ||
| 119 | {"DP", NULL, "hif6 Output"}, | ||
| 115 | /* CODEC BE connections */ | 120 | /* CODEC BE connections */ |
| 116 | { "Left Playback", NULL, "ssp0 Tx"}, | 121 | { "Left Playback", NULL, "ssp0 Tx"}, |
| 117 | { "Right Playback", NULL, "ssp0 Tx"}, | 122 | { "Right Playback", NULL, "ssp0 Tx"}, |
| @@ -126,6 +131,8 @@ static const struct snd_soc_dapm_route skylake_map[] = { | |||
| 126 | /* DMIC */ | 131 | /* DMIC */ |
| 127 | { "dmic01_hifi", NULL, "DMIC01 Rx" }, | 132 | { "dmic01_hifi", NULL, "DMIC01 Rx" }, |
| 128 | { "DMIC01 Rx", NULL, "DMIC AIF" }, | 133 | { "DMIC01 Rx", NULL, "DMIC AIF" }, |
| 134 | { "hifi1", NULL, "iDisp Tx"}, | ||
| 135 | { "iDisp Tx", NULL, "iDisp_out"}, | ||
| 129 | { "Headphone Jack", NULL, "Platform Clock" }, | 136 | { "Headphone Jack", NULL, "Platform Clock" }, |
| 130 | { "Headset Mic", NULL, "Platform Clock" }, | 137 | { "Headset Mic", NULL, "Platform Clock" }, |
| 131 | }; | 138 | }; |
| @@ -411,6 +418,19 @@ static struct snd_soc_dai_link skylake_dais[] = { | |||
| 411 | .dynamic = 1, | 418 | .dynamic = 1, |
| 412 | .ops = &skylake_dmic_ops, | 419 | .ops = &skylake_dmic_ops, |
| 413 | }, | 420 | }, |
| 421 | { | ||
| 422 | .name = "Skl HDMI Port", | ||
| 423 | .stream_name = "Hdmi", | ||
| 424 | .cpu_dai_name = "HDMI Pin", | ||
| 425 | .codec_name = "snd-soc-dummy", | ||
| 426 | .codec_dai_name = "snd-soc-dummy-dai", | ||
| 427 | .platform_name = "0000:00:1f.3", | ||
| 428 | .dpcm_playback = 1, | ||
| 429 | .init = NULL, | ||
| 430 | .nonatomic = 1, | ||
| 431 | .dynamic = 1, | ||
| 432 | }, | ||
| 433 | |||
| 414 | /* Back End DAI links */ | 434 | /* Back End DAI links */ |
| 415 | { | 435 | { |
| 416 | /* SSP0 - Codec */ | 436 | /* SSP0 - Codec */ |
| @@ -459,6 +479,16 @@ static struct snd_soc_dai_link skylake_dais[] = { | |||
| 459 | .dpcm_capture = 1, | 479 | .dpcm_capture = 1, |
| 460 | .no_pcm = 1, | 480 | .no_pcm = 1, |
| 461 | }, | 481 | }, |
| 482 | { | ||
| 483 | .name = "iDisp", | ||
| 484 | .be_id = 3, | ||
| 485 | .cpu_dai_name = "iDisp Pin", | ||
| 486 | .codec_name = "ehdaudio0D2", | ||
| 487 | .codec_dai_name = "intel-hdmi-hifi1", | ||
| 488 | .platform_name = "0000:00:1f.3", | ||
| 489 | .dpcm_playback = 1, | ||
| 490 | .no_pcm = 1, | ||
| 491 | }, | ||
| 462 | }; | 492 | }; |
| 463 | 493 | ||
| 464 | /* skylake audio machine driver for SPT + NAU88L25 */ | 494 | /* skylake audio machine driver for SPT + NAU88L25 */ |