Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74dde20c authored Apr 20, 2016 by Mark Brown

Merge branches 'topic/dai-link' and 'topic/find-dai' of...

Merge branches 'topic/dai-link' and 'topic/find-dai' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-topology

parents b84fff5a 2f0ad491 305e9020

include/sound/soc.h

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	@@ -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,		int snd_soc_register_dai(struct snd_soc_component *component,
	struct snd_soc_dai_driver *dai_drv);		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>		#include <sound/soc-dai.h>

	#ifdef CONFIG_DEBUG_FS		#ifdef CONFIG_DEBUG_FS

sound/soc/intel/boards/broadwell.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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,