Merge branches 'topic/dai-link' and 'topic/find-dai' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-topology
This commit is contained in:
commit
74dde20c2d
|
@ -1002,7 +1002,7 @@ struct snd_soc_dai_link {
|
|||
*/
|
||||
const char *platform_name;
|
||||
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;
|
||||
unsigned int num_params;
|
||||
|
@ -1683,6 +1683,9 @@ void snd_soc_remove_dai_link(struct snd_soc_card *card,
|
|||
int snd_soc_register_dai(struct snd_soc_component *component,
|
||||
struct snd_soc_dai_driver *dai_drv);
|
||||
|
||||
struct snd_soc_dai *snd_soc_find_dai(
|
||||
const struct snd_soc_dai_link_component *dlc);
|
||||
|
||||
#include <sound/soc-dai.h>
|
||||
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
|
|
|
@ -201,7 +201,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = {
|
|||
{
|
||||
/* SSP0 - Codec */
|
||||
.name = "Codec",
|
||||
.be_id = 0,
|
||||
.id = 0,
|
||||
.cpu_dai_name = "snd-soc-dummy-dai",
|
||||
.platform_name = "snd-soc-dummy",
|
||||
.no_pcm = 1,
|
||||
|
|
|
@ -304,7 +304,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
|
|||
/* back ends */
|
||||
{
|
||||
.name = "SSP2-Codec",
|
||||
.be_id = 1,
|
||||
.id = 1,
|
||||
.cpu_dai_name = "ssp2-port",
|
||||
.platform_name = "sst-mfld-platform",
|
||||
.no_pcm = 1,
|
||||
|
|
|
@ -267,7 +267,7 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
|
|||
/* back ends */
|
||||
{
|
||||
.name = "SSP2-Codec",
|
||||
.be_id = 1,
|
||||
.id = 1,
|
||||
.cpu_dai_name = "ssp2-port",
|
||||
.platform_name = "sst-mfld-platform",
|
||||
.no_pcm = 1,
|
||||
|
|
|
@ -255,7 +255,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
|
|||
/* back ends */
|
||||
{
|
||||
.name = "SSP2-Codec",
|
||||
.be_id = 1,
|
||||
.id = 1,
|
||||
.cpu_dai_name = "ssp2-port",
|
||||
.platform_name = "sst-mfld-platform",
|
||||
.no_pcm = 1,
|
||||
|
|
|
@ -295,7 +295,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
|
|||
/* back ends */
|
||||
{
|
||||
.name = "SSP2-Codec",
|
||||
.be_id = 1,
|
||||
.id = 1,
|
||||
.cpu_dai_name = "ssp2-port",
|
||||
.platform_name = "sst-mfld-platform",
|
||||
.no_pcm = 1,
|
||||
|
|
|
@ -273,7 +273,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
|
|||
{
|
||||
/* SSP2 - Codec */
|
||||
.name = "SSP2-Codec",
|
||||
.be_id = 1,
|
||||
.id = 1,
|
||||
.cpu_dai_name = "ssp2-port",
|
||||
.platform_name = "sst-mfld-platform",
|
||||
.no_pcm = 1,
|
||||
|
|
|
@ -156,7 +156,7 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = {
|
|||
{
|
||||
/* SSP0 - Codec */
|
||||
.name = "Codec",
|
||||
.be_id = 0,
|
||||
.id = 0,
|
||||
.cpu_dai_name = "snd-soc-dummy-dai",
|
||||
.platform_name = "snd-soc-dummy",
|
||||
.no_pcm = 1,
|
||||
|
|
|
@ -456,7 +456,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
|||
{
|
||||
/* SSP0 - Codec */
|
||||
.name = "SSP0-Codec",
|
||||
.be_id = 0,
|
||||
.id = 0,
|
||||
.cpu_dai_name = "SSP0 Pin",
|
||||
.platform_name = "0000:00:1f.3",
|
||||
.no_pcm = 1,
|
||||
|
@ -472,7 +472,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
|||
{
|
||||
/* SSP1 - Codec */
|
||||
.name = "SSP1-Codec",
|
||||
.be_id = 1,
|
||||
.id = 1,
|
||||
.cpu_dai_name = "SSP1 Pin",
|
||||
.platform_name = "0000:00:1f.3",
|
||||
.no_pcm = 1,
|
||||
|
@ -489,7 +489,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
|||
},
|
||||
{
|
||||
.name = "dmic01",
|
||||
.be_id = 2,
|
||||
.id = 2,
|
||||
.cpu_dai_name = "DMIC01 Pin",
|
||||
.codec_name = "dmic-codec",
|
||||
.codec_dai_name = "dmic-hifi",
|
||||
|
@ -501,7 +501,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
|||
},
|
||||
{
|
||||
.name = "iDisp1",
|
||||
.be_id = 3,
|
||||
.id = 3,
|
||||
.cpu_dai_name = "iDisp1 Pin",
|
||||
.codec_name = "ehdaudio0D2",
|
||||
.codec_dai_name = "intel-hdmi-hifi1",
|
||||
|
@ -512,7 +512,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
|||
},
|
||||
{
|
||||
.name = "iDisp2",
|
||||
.be_id = 4,
|
||||
.id = 4,
|
||||
.cpu_dai_name = "iDisp2 Pin",
|
||||
.codec_name = "ehdaudio0D2",
|
||||
.codec_dai_name = "intel-hdmi-hifi2",
|
||||
|
@ -523,7 +523,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
|||
},
|
||||
{
|
||||
.name = "iDisp3",
|
||||
.be_id = 5,
|
||||
.id = 5,
|
||||
.cpu_dai_name = "iDisp3 Pin",
|
||||
.codec_name = "ehdaudio0D2",
|
||||
.codec_dai_name = "intel-hdmi-hifi3",
|
||||
|
|
|
@ -505,7 +505,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
|||
{
|
||||
/* SSP0 - Codec */
|
||||
.name = "SSP0-Codec",
|
||||
.be_id = 0,
|
||||
.id = 0,
|
||||
.cpu_dai_name = "SSP0 Pin",
|
||||
.platform_name = "0000:00:1f.3",
|
||||
.no_pcm = 1,
|
||||
|
@ -523,7 +523,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
|||
{
|
||||
/* SSP1 - Codec */
|
||||
.name = "SSP1-Codec",
|
||||
.be_id = 1,
|
||||
.id = 1,
|
||||
.cpu_dai_name = "SSP1 Pin",
|
||||
.platform_name = "0000:00:1f.3",
|
||||
.no_pcm = 1,
|
||||
|
@ -540,7 +540,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
|||
},
|
||||
{
|
||||
.name = "dmic01",
|
||||
.be_id = 2,
|
||||
.id = 2,
|
||||
.cpu_dai_name = "DMIC01 Pin",
|
||||
.codec_name = "dmic-codec",
|
||||
.codec_dai_name = "dmic-hifi",
|
||||
|
@ -552,7 +552,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
|||
},
|
||||
{
|
||||
.name = "iDisp1",
|
||||
.be_id = 3,
|
||||
.id = 3,
|
||||
.cpu_dai_name = "iDisp1 Pin",
|
||||
.codec_name = "ehdaudio0D2",
|
||||
.codec_dai_name = "intel-hdmi-hifi1",
|
||||
|
@ -563,7 +563,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
|||
},
|
||||
{
|
||||
.name = "iDisp2",
|
||||
.be_id = 4,
|
||||
.id = 4,
|
||||
.cpu_dai_name = "iDisp2 Pin",
|
||||
.codec_name = "ehdaudio0D2",
|
||||
.codec_dai_name = "intel-hdmi-hifi2",
|
||||
|
@ -574,7 +574,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
|
|||
},
|
||||
{
|
||||
.name = "iDisp3",
|
||||
.be_id = 5,
|
||||
.id = 5,
|
||||
.cpu_dai_name = "iDisp3 Pin",
|
||||
.codec_name = "ehdaudio0D2",
|
||||
.codec_dai_name = "intel-hdmi-hifi3",
|
||||
|
|
|
@ -375,7 +375,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
|
|||
{
|
||||
/* SSP0 - Codec */
|
||||
.name = "SSP0-Codec",
|
||||
.be_id = 0,
|
||||
.id = 0,
|
||||
.cpu_dai_name = "SSP0 Pin",
|
||||
.platform_name = "0000:00:1f.3",
|
||||
.no_pcm = 1,
|
||||
|
@ -393,7 +393,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
|
|||
},
|
||||
{
|
||||
.name = "dmic01",
|
||||
.be_id = 1,
|
||||
.id = 1,
|
||||
.cpu_dai_name = "DMIC01 Pin",
|
||||
.codec_name = "dmic-codec",
|
||||
.codec_dai_name = "dmic-hifi",
|
||||
|
@ -405,7 +405,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
|
|||
},
|
||||
{
|
||||
.name = "iDisp1",
|
||||
.be_id = 2,
|
||||
.id = 2,
|
||||
.cpu_dai_name = "iDisp1 Pin",
|
||||
.codec_name = "ehdaudio0D2",
|
||||
.codec_dai_name = "intel-hdmi-hifi1",
|
||||
|
@ -416,7 +416,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
|
|||
},
|
||||
{
|
||||
.name = "iDisp2",
|
||||
.be_id = 3,
|
||||
.id = 3,
|
||||
.cpu_dai_name = "iDisp2 Pin",
|
||||
.codec_name = "ehdaudio0D2",
|
||||
.codec_dai_name = "intel-hdmi-hifi2",
|
||||
|
@ -427,7 +427,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
|
|||
},
|
||||
{
|
||||
.name = "iDisp3",
|
||||
.be_id = 4,
|
||||
.id = 4,
|
||||
.cpu_dai_name = "iDisp3 Pin",
|
||||
.codec_name = "ehdaudio0D2",
|
||||
.codec_dai_name = "intel-hdmi-hifi3",
|
||||
|
|
|
@ -930,7 +930,7 @@ static struct snd_soc_component *soc_find_component(
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static struct snd_soc_dai *snd_soc_find_dai(
|
||||
struct snd_soc_dai *snd_soc_find_dai(
|
||||
const struct snd_soc_dai_link_component *dlc)
|
||||
{
|
||||
struct snd_soc_component *component;
|
||||
|
@ -959,6 +959,7 @@ static struct snd_soc_dai *snd_soc_find_dai(
|
|||
|
||||
return NULL;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(snd_soc_find_dai);
|
||||
|
||||
static bool soc_is_dai_link_bound(struct snd_soc_card *card,
|
||||
struct snd_soc_dai_link *dai_link)
|
||||
|
|
Loading…
Reference in a new issue