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

Commit 205d231b authored by Mark Brown's avatar Mark Brown
Browse files

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent d330a080

arch/arm/mach-mx3/clock-imx31.c

+2 −2
Original line number Diff line number Diff line
@@ -558,8 +558,8 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK("mxc_w1.0", NULL, owire_clk)

	_REGISTER_CLOCK("mxc-mmc.0", NULL, sdhc1_clk)

	_REGISTER_CLOCK("mxc-mmc.1", NULL, sdhc2_clk)

	_REGISTER_CLOCK("imx-ssi-dai.0", NULL, ssi1_clk)

	_REGISTER_CLOCK("imx-ssi-dai.1", NULL, ssi2_clk)

	_REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)

	_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)

	_REGISTER_CLOCK(NULL, "firi", firi_clk)

	_REGISTER_CLOCK(NULL, "ata", ata_clk)

	_REGISTER_CLOCK(NULL, "rtic", rtic_clk)

arch/arm/mach-mx3/clock-imx35.c

+2 −2
Original line number Diff line number Diff line
@@ -464,8 +464,8 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK(NULL, "sdma", sdma_clk)

	_REGISTER_CLOCK(NULL, "spba", spba_clk)

	_REGISTER_CLOCK(NULL, "spdif", spdif_clk)

	_REGISTER_CLOCK("imx-ssi-dai.0", NULL, ssi1_clk)

	_REGISTER_CLOCK("imx-ssi-dai.1", NULL, ssi2_clk)

	_REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)

	_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)

	_REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk)

	_REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk)

	_REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk)

arch/arm/mach-mx3/devices.c

+2 −2
Original line number Diff line number Diff line
@@ -327,14 +327,14 @@ static struct resource imx_ssi_resources1[] = { 
};



struct platform_device imx_ssi_device0 = {

	.name = "imx-ssi-dai",

	.name = "imx-ssi",

	.id = 0,

	.num_resources = ARRAY_SIZE(imx_ssi_resources0),

	.resource = imx_ssi_resources0,

};



struct platform_device imx_ssi_device1 = {

	.name = "imx-ssi-dai",

	.name = "imx-ssi",

	.id = 1,

	.num_resources = ARRAY_SIZE(imx_ssi_resources1),

	.resource = imx_ssi_resources1,

arch/arm/plat-mxc/audmux-v2.c

+2 −2
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ static const char *audmux_port_string(int port) 
{

	switch (port) {

	case MX31_AUDMUX_PORT1_SSI0:

		return "imx-ssi-dai.0";

		return "imx-ssi.0";

	case MX31_AUDMUX_PORT2_SSI1:

		return "imx-ssi-dai.1";

		return "imx-ssi.1";

	case MX31_AUDMUX_PORT3_SSI_PINS_3:

		return "SSI3";

	case MX31_AUDMUX_PORT4_SSI_PINS_4:

sound/soc/imx/eukrea-tlv320.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = { 
	.codec_dai	= "tlv320aic23-hifi",

	.platform_name	= "imx-pcm-audio.0",

	.codec_name	= "tlv320aic23-codec.0-001a",

	.cpu_dai = "imx-ssi-dai.0",

	.cpu_dai = "imx-ssi.0",

	.ops		= &eukrea_tlv320_snd_ops,

};