From c50c2f7af1fe503b1c3b8cb0fa0e3c9b4bba9e92 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 15 Jul 2013 16:39:09 +0100 Subject: ASoC: kirkwood: Remove unused headers Signed-off-by: Mark Brown --- sound/soc/kirkwood/kirkwood-t5325.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'sound/soc/kirkwood/kirkwood-t5325.c') diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c index 1d0ed6f..4f4cb56 100644 --- a/sound/soc/kirkwood/kirkwood-t5325.c +++ b/sound/soc/kirkwood/kirkwood-t5325.c @@ -15,9 +15,7 @@ #include #include #include -#include #include -#include #include "../codecs/alc5623.h" static int t5325_hw_params(struct snd_pcm_substream *substream, -- cgit v1.1 From 64ddf1f89cd7a483e1204320395023774234b49a Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 4 Aug 2013 20:27:03 +0100 Subject: ASoC: kirkwood: combine kirkwood-i2s and kirkwood-dma drivers These really should be a single driver because they're fully integrated in hardware. Make them so. Signed-off-by: Russell King Signed-off-by: Mark Brown --- sound/soc/kirkwood/kirkwood-t5325.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sound/soc/kirkwood/kirkwood-t5325.c') diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c index 4f4cb56..27545b0 100644 --- a/sound/soc/kirkwood/kirkwood-t5325.c +++ b/sound/soc/kirkwood/kirkwood-t5325.c @@ -68,8 +68,8 @@ static struct snd_soc_dai_link t5325_dai[] = { { .name = "ALC5621", .stream_name = "ALC5621 HiFi", - .cpu_dai_name = "kirkwood-i2s", - .platform_name = "kirkwood-pcm-audio", + .cpu_dai_name = "mvebu-audio", + .platform_name = "mvebu-audio", .codec_dai_name = "alc5621-hifi", .codec_name = "alc562x-codec.0-001a", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS, -- cgit v1.1