ASoC: Remove -dai suffix from i.MX SSI driver
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 30 Sep 2010 20:46:14 +0000 (13:46 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 1 Oct 2010 07:13:28 +0000 (00:13 -0700)
commit205d231bfbd26bb10400518586d2a9f1b62858ee
treeb4b53b06805aabbfb0ebccae423e5084d92d874c
parentd330a080a87831b693a2dad1058cd11bbb6c3736
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>
arch/arm/mach-mx3/clock-imx31.c
arch/arm/mach-mx3/clock-imx35.c
arch/arm/mach-mx3/devices.c
arch/arm/plat-mxc/audmux-v2.c
sound/soc/imx/eukrea-tlv320.c
sound/soc/imx/imx-ssi.c
sound/soc/imx/phycore-ac97.c
sound/soc/imx/wm1133-ev1.c