Skip to content

L
linux
Commit 7a1be1a5 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge branch 'topic/dai-link' of... 

Merge branch 'topic/dai-link' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
parents 396cbebe 2f0ad491
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
include/sound/soc.h
View file @ 7a1be1a5
...@@ -1002,7 +1002,7 @@ struct snd_soc_dai_link { ...@@ -1002,7 +1002,7 @@ struct snd_soc_dai_link {
*/ */
const char *platform_name; const char *platform_name;
struct device_node *platform_of_node; struct device_node *platform_of_node;
int be_id; /* optional ID for machine driver BE identification */ int id; /* optional ID for machine driver link identification */
const struct snd_soc_pcm_stream *params; const struct snd_soc_pcm_stream *params;
unsigned int num_params; unsigned int num_params;
......
sound/soc/intel/boards/broadwell.c
View file @ 7a1be1a5
...@@ -201,7 +201,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { ...@@ -201,7 +201,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = {
{ {
/* SSP0 - Codec */ /* SSP0 - Codec */
.name = "Codec", .name = "Codec",
.be_id = 0, .id = 0,
.cpu_dai_name = "snd-soc-dummy-dai", .cpu_dai_name = "snd-soc-dummy-dai",
.platform_name = "snd-soc-dummy", .platform_name = "snd-soc-dummy",
.no_pcm = 1, .no_pcm = 1,
......
sound/soc/intel/boards/bytcr_rt5640.c
View file @ 7a1be1a5
...@@ -304,7 +304,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { ...@@ -304,7 +304,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
/* back ends */ /* back ends */
{ {
.name = "SSP2-Codec", .name = "SSP2-Codec",
.be_id = 1, .id = 1,
.cpu_dai_name = "ssp2-port", .cpu_dai_name = "ssp2-port",
.platform_name = "sst-mfld-platform", .platform_name = "sst-mfld-platform",
.no_pcm = 1, .no_pcm = 1,
......
sound/soc/intel/boards/bytcr_rt5651.c
View file @ 7a1be1a5
...@@ -267,7 +267,7 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { ...@@ -267,7 +267,7 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
/* back ends */ /* back ends */
{ {
.name = "SSP2-Codec", .name = "SSP2-Codec",
.be_id = 1, .id = 1,
.cpu_dai_name = "ssp2-port", .cpu_dai_name = "ssp2-port",
.platform_name = "sst-mfld-platform", .platform_name = "sst-mfld-platform",
.no_pcm = 1, .no_pcm = 1,
......
sound/soc/intel/boards/cht_bsw_max98090_ti.c
View file @ 7a1be1a5
...@@ -255,7 +255,7 @@ static struct snd_soc_dai_link cht_dailink[] = { ...@@ -255,7 +255,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
/* back ends */ /* back ends */
{ {
.name = "SSP2-Codec", .name = "SSP2-Codec",
.be_id = 1, .id = 1,
.cpu_dai_name = "ssp2-port", .cpu_dai_name = "ssp2-port",
.platform_name = "sst-mfld-platform", .platform_name = "sst-mfld-platform",
.no_pcm = 1, .no_pcm = 1,
......
sound/soc/intel/boards/cht_bsw_rt5645.c
View file @ 7a1be1a5
...@@ -295,7 +295,7 @@ static struct snd_soc_dai_link cht_dailink[] = { ...@@ -295,7 +295,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
/* back ends */ /* back ends */
{ {
.name = "SSP2-Codec", .name = "SSP2-Codec",
.be_id = 1, .id = 1,
.cpu_dai_name = "ssp2-port", .cpu_dai_name = "ssp2-port",
.platform_name = "sst-mfld-platform", .platform_name = "sst-mfld-platform",
.no_pcm = 1, .no_pcm = 1,
......
sound/soc/intel/boards/cht_bsw_rt5672.c
View file @ 7a1be1a5
...@@ -273,7 +273,7 @@ static struct snd_soc_dai_link cht_dailink[] = { ...@@ -273,7 +273,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
{ {
/* SSP2 - Codec */ /* SSP2 - Codec */
.name = "SSP2-Codec", .name = "SSP2-Codec",
.be_id = 1, .id = 1,
.cpu_dai_name = "ssp2-port", .cpu_dai_name = "ssp2-port",
.platform_name = "sst-mfld-platform", .platform_name = "sst-mfld-platform",
.no_pcm = 1, .no_pcm = 1,
......
sound/soc/intel/boards/haswell.c
View file @ 7a1be1a5
...@@ -156,7 +156,7 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = { ...@@ -156,7 +156,7 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = {
{ {
/* SSP0 - Codec */ /* SSP0 - Codec */
.name = "Codec", .name = "Codec",
.be_id = 0, .id = 0,
.cpu_dai_name = "snd-soc-dummy-dai", .cpu_dai_name = "snd-soc-dummy-dai",
.platform_name = "snd-soc-dummy", .platform_name = "snd-soc-dummy",
.no_pcm = 1, .no_pcm = 1,
......
sound/soc/intel/boards/skl_nau88l25_max98357a.c
View file @ 7a1be1a5
...@@ -455,7 +455,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -455,7 +455,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
{ {
/* SSP0 - Codec */ /* SSP0 - Codec */
.name = "SSP0-Codec", .name = "SSP0-Codec",
.be_id = 0, .id = 0,
.cpu_dai_name = "SSP0 Pin", .cpu_dai_name = "SSP0 Pin",
.platform_name = "0000:00:1f.3", .platform_name = "0000:00:1f.3",
.no_pcm = 1, .no_pcm = 1,
...@@ -471,7 +471,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -471,7 +471,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
{ {
/* SSP1 - Codec */ /* SSP1 - Codec */
.name = "SSP1-Codec", .name = "SSP1-Codec",
.be_id = 1, .id = 1,
.cpu_dai_name = "SSP1 Pin", .cpu_dai_name = "SSP1 Pin",
.platform_name = "0000:00:1f.3", .platform_name = "0000:00:1f.3",
.no_pcm = 1, .no_pcm = 1,
...@@ -488,7 +488,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -488,7 +488,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
}, },
{ {
.name = "dmic01", .name = "dmic01",
.be_id = 2, .id = 2,
.cpu_dai_name = "DMIC01 Pin", .cpu_dai_name = "DMIC01 Pin",
.codec_name = "dmic-codec", .codec_name = "dmic-codec",
.codec_dai_name = "dmic-hifi", .codec_dai_name = "dmic-hifi",
...@@ -500,7 +500,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -500,7 +500,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
}, },
{ {
.name = "iDisp1", .name = "iDisp1",
.be_id = 3, .id = 3,
.cpu_dai_name = "iDisp1 Pin", .cpu_dai_name = "iDisp1 Pin",
.codec_name = "ehdaudio0D2", .codec_name = "ehdaudio0D2",
.codec_dai_name = "intel-hdmi-hifi1", .codec_dai_name = "intel-hdmi-hifi1",
...@@ -511,7 +511,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -511,7 +511,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
}, },
{ {
.name = "iDisp2", .name = "iDisp2",
.be_id = 4, .id = 4,
.cpu_dai_name = "iDisp2 Pin", .cpu_dai_name = "iDisp2 Pin",
.codec_name = "ehdaudio0D2", .codec_name = "ehdaudio0D2",
.codec_dai_name = "intel-hdmi-hifi2", .codec_dai_name = "intel-hdmi-hifi2",
...@@ -522,7 +522,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -522,7 +522,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
}, },
{ {
.name = "iDisp3", .name = "iDisp3",
.be_id = 5, .id = 5,
.cpu_dai_name = "iDisp3 Pin", .cpu_dai_name = "iDisp3 Pin",
.codec_name = "ehdaudio0D2", .codec_name = "ehdaudio0D2",
.codec_dai_name = "intel-hdmi-hifi3", .codec_dai_name = "intel-hdmi-hifi3",
......
sound/soc/intel/boards/skl_nau88l25_ssm4567.c
View file @ 7a1be1a5
...@@ -504,7 +504,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -504,7 +504,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
{ {
/* SSP0 - Codec */ /* SSP0 - Codec */
.name = "SSP0-Codec", .name = "SSP0-Codec",
.be_id = 0, .id = 0,
.cpu_dai_name = "SSP0 Pin", .cpu_dai_name = "SSP0 Pin",
.platform_name = "0000:00:1f.3", .platform_name = "0000:00:1f.3",
.no_pcm = 1, .no_pcm = 1,
...@@ -522,7 +522,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -522,7 +522,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
{ {
/* SSP1 - Codec */ /* SSP1 - Codec */
.name = "SSP1-Codec", .name = "SSP1-Codec",
.be_id = 1, .id = 1,
.cpu_dai_name = "SSP1 Pin", .cpu_dai_name = "SSP1 Pin",
.platform_name = "0000:00:1f.3", .platform_name = "0000:00:1f.3",
.no_pcm = 1, .no_pcm = 1,
...@@ -539,7 +539,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -539,7 +539,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
}, },
{ {
.name = "dmic01", .name = "dmic01",
.be_id = 2, .id = 2,
.cpu_dai_name = "DMIC01 Pin", .cpu_dai_name = "DMIC01 Pin",
.codec_name = "dmic-codec", .codec_name = "dmic-codec",
.codec_dai_name = "dmic-hifi", .codec_dai_name = "dmic-hifi",
...@@ -551,7 +551,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -551,7 +551,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
}, },
{ {
.name = "iDisp1", .name = "iDisp1",
.be_id = 3, .id = 3,
.cpu_dai_name = "iDisp1 Pin", .cpu_dai_name = "iDisp1 Pin",
.codec_name = "ehdaudio0D2", .codec_name = "ehdaudio0D2",
.codec_dai_name = "intel-hdmi-hifi1", .codec_dai_name = "intel-hdmi-hifi1",
...@@ -562,7 +562,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -562,7 +562,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
}, },
{ {
.name = "iDisp2", .name = "iDisp2",
.be_id = 4, .id = 4,
.cpu_dai_name = "iDisp2 Pin", .cpu_dai_name = "iDisp2 Pin",
.codec_name = "ehdaudio0D2", .codec_name = "ehdaudio0D2",
.codec_dai_name = "intel-hdmi-hifi2", .codec_dai_name = "intel-hdmi-hifi2",
...@@ -573,7 +573,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -573,7 +573,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
}, },
{ {
.name = "iDisp3", .name = "iDisp3",
.be_id = 5, .id = 5,
.cpu_dai_name = "iDisp3 Pin", .cpu_dai_name = "iDisp3 Pin",
.codec_name = "ehdaudio0D2", .codec_name = "ehdaudio0D2",
.codec_dai_name = "intel-hdmi-hifi3", .codec_dai_name = "intel-hdmi-hifi3",
......
sound/soc/intel/boards/skl_rt286.c
View file @ 7a1be1a5
...@@ -374,7 +374,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { ...@@ -374,7 +374,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
{ {
/* SSP0 - Codec */ /* SSP0 - Codec */
.name = "SSP0-Codec", .name = "SSP0-Codec",
.be_id = 0, .id = 0,
.cpu_dai_name = "SSP0 Pin", .cpu_dai_name = "SSP0 Pin",
.platform_name = "0000:00:1f.3", .platform_name = "0000:00:1f.3",
.no_pcm = 1, .no_pcm = 1,
...@@ -392,7 +392,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { ...@@ -392,7 +392,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
}, },
{ {
.name = "dmic01", .name = "dmic01",
.be_id = 1, .id = 1,
.cpu_dai_name = "DMIC01 Pin", .cpu_dai_name = "DMIC01 Pin",
.codec_name = "dmic-codec", .codec_name = "dmic-codec",
.codec_dai_name = "dmic-hifi", .codec_dai_name = "dmic-hifi",
...@@ -404,7 +404,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { ...@@ -404,7 +404,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
}, },
{ {
.name = "iDisp1", .name = "iDisp1",
.be_id = 2, .id = 2,
.cpu_dai_name = "iDisp1 Pin", .cpu_dai_name = "iDisp1 Pin",
.codec_name = "ehdaudio0D2", .codec_name = "ehdaudio0D2",
.codec_dai_name = "intel-hdmi-hifi1", .codec_dai_name = "intel-hdmi-hifi1",
...@@ -415,7 +415,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { ...@@ -415,7 +415,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
}, },
{ {
.name = "iDisp2", .name = "iDisp2",
.be_id = 3, .id = 3,
.cpu_dai_name = "iDisp2 Pin", .cpu_dai_name = "iDisp2 Pin",
.codec_name = "ehdaudio0D2", .codec_name = "ehdaudio0D2",
.codec_dai_name = "intel-hdmi-hifi2", .codec_dai_name = "intel-hdmi-hifi2",
...@@ -426,7 +426,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { ...@@ -426,7 +426,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
}, },
{ {
.name = "iDisp3", .name = "iDisp3",
.be_id = 4, .id = 4,
.cpu_dai_name = "iDisp3 Pin", .cpu_dai_name = "iDisp3 Pin",
.codec_name = "ehdaudio0D2", .codec_name = "ehdaudio0D2",
.codec_dai_name = "intel-hdmi-hifi3", .codec_dai_name = "intel-hdmi-hifi3",
......
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