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

Commit bfe4ee0a authored by Mike Frysinger's avatar Mike Frysinger Committed by Mark Brown
Browse files

ASoC: Blackfin: standardize machine driver names 



Some machine drivers were using "bf5xx-", others were using "bf5xx_",
while others were using "bfin-".  Further, some were using the same
name in the transport layer which makes it hard to use different codecs
at the same time.  So standardize all of them to "bfin-" and make sure
they are name spaced according to their driver name.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent c8ad38b8

sound/soc/blackfin/bf5xx-ac97-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ static int __devexit bf5xx_soc_platform_remove(struct platform_device *pdev) 


static struct platform_driver bf5xx_pcm_driver = {

	.driver = {

			.name = "bf5xx-pcm-audio",

			.name = "bfin-ac97-pcm-audio",

			.owner = THIS_MODULE,

	},

sound/soc/blackfin/bf5xx-ad1836.c

+3 −3
Original line number Diff line number Diff line
@@ -82,15 +82,15 @@ static struct snd_soc_ops bf5xx_ad1836_ops = { 
static struct snd_soc_dai_link bf5xx_ad1836_dai = {

	.name = "ad1836",

	.stream_name = "AD1836",

	.cpu_dai_name = "bf5xx-tdm",

	.cpu_dai_name = "bfin-tdm",

	.codec_dai_name = "ad1836-hifi",

	.platform_name = "bf5xx-tdm-pcm-audio",

	.platform_name = "bfin-tdm-pcm-audio",

	.codec_name = "ad1836.0",

	.ops = &bf5xx_ad1836_ops,

};



static struct snd_soc_card bf5xx_ad1836 = {

	.name = "bf5xx_ad1836",

	.name = "bfin-ad1836",

	.dai_link = &bf5xx_ad1836_dai,

	.num_links = 1,

};

sound/soc/blackfin/bf5xx-ad193x.c

+3 −3
Original line number Diff line number Diff line
@@ -110,15 +110,15 @@ static struct snd_soc_ops bf5xx_ad193x_ops = { 
static struct snd_soc_dai_link bf5xx_ad193x_dai = {

	.name = "ad193x",

	.stream_name = "AD193X",

	.cpu_dai_name = "bf5xx-tdm",

	.cpu_dai_name = "bfin-tdm",

	.codec_dai_name ="ad193x-hifi",

	.platform_name = "bf5xx-tdm-pcm-audio",

	.platform_name = "bfin-tdm-pcm-audio",

	.codec_name = "ad193x.5",

	.ops = &bf5xx_ad193x_ops,

};



static struct snd_soc_card bf5xx_ad193x = {

	.name = "bf5xx_ad193x",

	.name = "bfin-ad193x",

	.dai_link = &bf5xx_ad193x_dai,

	.num_links = 1,

};

sound/soc/blackfin/bf5xx-ad1980.c

+2 −2
Original line number Diff line number Diff line
@@ -72,13 +72,13 @@ static struct snd_soc_dai_link bf5xx_board_dai = { 
	.stream_name = "AC97 HiFi",

	.cpu_dai_name = "bfin-ac97",

	.codec_dai_name = "ad1980-hifi",

	.platform_name = "bfin-pcm-audio",

	.platform_name = "bfin-ac97-pcm-audio",

	.codec_name = "ad1980",

	.ops = &bf5xx_board_ops,

};



static struct snd_soc_card bf5xx_board = {

	.name = "bf5xx-board",

	.name = "bfin-ad1980",

	.dai_link = &bf5xx_board_dai,

	.num_links = 1,

};

sound/soc/blackfin/bf5xx-ad73311.c

+3 −3
Original line number Diff line number Diff line
@@ -183,15 +183,15 @@ static struct snd_soc_ops bf5xx_ad73311_ops = { 
static struct snd_soc_dai_link bf5xx_ad73311_dai = {

	.name = "ad73311",

	.stream_name = "AD73311",

	.cpu_dai_name = "bf5xx-i2s",

	.cpu_dai_name = "bfin-i2s",

	.codec_dai_name = "ad73311-hifi",

	.platform_name = "bfin-pcm-audio",

	.platform_name = "bfin-i2s-pcm-audio",

	.codec_name = "ad73311",

	.ops = &bf5xx_ad73311_ops,

};



static struct snd_soc_card bf5xx_ad73311 = {

	.name = "bf5xx_ad73311",

	.name = "bfin-ad73311",

	.probe = bf5xx_probe,

	.dai_link = &bf5xx_ad73311_dai,

	.num_links = 1,