提交 2f0ad491 编写于 作者: M Mengdong Lin 提交者: Mark Brown

ASoC: Change DAI link's be_id to a generic id

The generic ID can be used by topology:
- Toplogy can create FE links and set their ID, machine drivers will
  be notified and check this ID for machine-specific init.
- Toplogy can use the ID to find existing BE & CC links and further
  configure them.
Signed-off-by: NMengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: NMark Brown <broonie@kernel.org>
上级 f55532a0
...@@ -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;
......
...@@ -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,
......
...@@ -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,
......
...@@ -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,
......
...@@ -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,
......
...@@ -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,
......
...@@ -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,
......
...@@ -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,
......
...@@ -456,7 +456,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -456,7 +456,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,
...@@ -472,7 +472,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -472,7 +472,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,
...@@ -489,7 +489,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -489,7 +489,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",
...@@ -501,7 +501,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -501,7 +501,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",
...@@ -512,7 +512,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -512,7 +512,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",
...@@ -523,7 +523,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -523,7 +523,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",
......
...@@ -505,7 +505,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -505,7 +505,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,
...@@ -523,7 +523,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -523,7 +523,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,
...@@ -540,7 +540,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -540,7 +540,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",
...@@ -552,7 +552,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -552,7 +552,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",
...@@ -563,7 +563,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -563,7 +563,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",
...@@ -574,7 +574,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -574,7 +574,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",
......
...@@ -375,7 +375,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { ...@@ -375,7 +375,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,
...@@ -393,7 +393,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { ...@@ -393,7 +393,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",
...@@ -405,7 +405,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { ...@@ -405,7 +405,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",
...@@ -416,7 +416,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { ...@@ -416,7 +416,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",
...@@ -427,7 +427,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { ...@@ -427,7 +427,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% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册