tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ASoC: Remove -dai suffix from i.MX SSI driver

While it is a generic serial port in practice the i.MX SSI is only supported
in Linux as an audio port (the i.MX has dedicated SPI controllers and so on).
This means we don't need to disambiguate against other uses of the hardware
and so can drop the -dai suffix from the driver name which fixes merge
issues with the i.MX tree in -next.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>

Mark Brown 205d231b d330a080

+12 -12
+2 -2
arch/arm/mach-mx3/clock-imx31.c
··· 558 558 _REGISTER_CLOCK("mxc_w1.0", NULL, owire_clk) 559 559 _REGISTER_CLOCK("mxc-mmc.0", NULL, sdhc1_clk) 560 560 _REGISTER_CLOCK("mxc-mmc.1", NULL, sdhc2_clk) 561 - _REGISTER_CLOCK("imx-ssi-dai.0", NULL, ssi1_clk) 562 - _REGISTER_CLOCK("imx-ssi-dai.1", NULL, ssi2_clk) 561 + _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) 562 + _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) 563 563 _REGISTER_CLOCK(NULL, "firi", firi_clk) 564 564 _REGISTER_CLOCK(NULL, "ata", ata_clk) 565 565 _REGISTER_CLOCK(NULL, "rtic", rtic_clk)
+2 -2
arch/arm/mach-mx3/clock-imx35.c
··· 464 464 _REGISTER_CLOCK(NULL, "sdma", sdma_clk) 465 465 _REGISTER_CLOCK(NULL, "spba", spba_clk) 466 466 _REGISTER_CLOCK(NULL, "spdif", spdif_clk) 467 - _REGISTER_CLOCK("imx-ssi-dai.0", NULL, ssi1_clk) 468 - _REGISTER_CLOCK("imx-ssi-dai.1", NULL, ssi2_clk) 467 + _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) 468 + _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) 469 469 _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk) 470 470 _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk) 471 471 _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk)
+2 -2
arch/arm/mach-mx3/devices.c
··· 327 327 }; 328 328 329 329 struct platform_device imx_ssi_device0 = { 330 - .name = "imx-ssi-dai", 330 + .name = "imx-ssi", 331 331 .id = 0, 332 332 .num_resources = ARRAY_SIZE(imx_ssi_resources0), 333 333 .resource = imx_ssi_resources0, 334 334 }; 335 335 336 336 struct platform_device imx_ssi_device1 = { 337 - .name = "imx-ssi-dai", 337 + .name = "imx-ssi", 338 338 .id = 1, 339 339 .num_resources = ARRAY_SIZE(imx_ssi_resources1), 340 340 .resource = imx_ssi_resources1,
+2 -2
arch/arm/plat-mxc/audmux-v2.c
··· 45 45 { 46 46 switch (port) { 47 47 case MX31_AUDMUX_PORT1_SSI0: 48 - return "imx-ssi-dai.0"; 48 + return "imx-ssi.0"; 49 49 case MX31_AUDMUX_PORT2_SSI1: 50 - return "imx-ssi-dai.1"; 50 + return "imx-ssi.1"; 51 51 case MX31_AUDMUX_PORT3_SSI_PINS_3: 52 52 return "SSI3"; 53 53 case MX31_AUDMUX_PORT4_SSI_PINS_4:
+1 -1
sound/soc/imx/eukrea-tlv320.c
··· 82 82 .codec_dai = "tlv320aic23-hifi", 83 83 .platform_name = "imx-pcm-audio.0", 84 84 .codec_name = "tlv320aic23-codec.0-001a", 85 - .cpu_dai = "imx-ssi-dai.0", 85 + .cpu_dai = "imx-ssi.0", 86 86 .ops = &eukrea_tlv320_snd_ops, 87 87 }; 88 88
+1 -1
sound/soc/imx/imx-ssi.c
··· 734 734 .remove = __devexit_p(imx_ssi_remove), 735 735 736 736 .driver = { 737 - .name = "imx-ssi-dai", 737 + .name = "imx-ssi", 738 738 .owner = THIS_MODULE, 739 739 }, 740 740 };
+1 -1
sound/soc/imx/phycore-ac97.c
··· 34 34 .stream_name = "HiFi", 35 35 .codec_dai_name = "wm9712-hifi", 36 36 .codec_name = "wm9712-codec", 37 - .cpu_dai_name = "imx-ssi-dai.0", 37 + .cpu_dai_name = "imx-ssi.0", 38 38 .platform_name = "imx-fiq-pcm-audio.0", 39 39 .ops = &imx_phycore_hifi_ops, 40 40 },
+1 -1
sound/soc/imx/wm1133-ev1.c
··· 243 243 static struct snd_soc_dai_link wm1133_ev1_dai = { 244 244 .name = "WM1133-EV1", 245 245 .stream_name = "Audio", 246 - .cpu_dai_name = "imx-ssi-dai.0", 246 + .cpu_dai_name = "imx-ssi.0", 247 247 .codec_dai_name = "wm8350-hifi", 248 248 .platform_name = "imx-fiq-pcm-audio.0", 249 249 .codec_name = "wm8350-codec.0-0x1a",