From ea3cc53f2d461a29ac3ee1372c60b18eff617808 Mon Sep 17 00:00:00 2001
From: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Date: Fri, 2 Nov 2012 13:02:53 +0000
Subject: [PATCH] --- yaml --- r: 335637 b: refs/heads/master c:
 213a79656462176b553c6f9cdf96e14313e43bcf h: refs/heads/master i:   335635:
 009bc4bddbe5960dd209a726a52cef63d47cdebd v: v3

---
 [refs]                          |  2 +-
 trunk/sound/soc/mxs/mxs-saif.c  | 17 ++++-------------
 trunk/sound/soc/samsung/Kconfig |  1 +
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 2f1e0928ce15..20cbede96c1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f55f14752ecaccf7d6a52fd13929b73fcb191f19
+refs/heads/master: 213a79656462176b553c6f9cdf96e14313e43bcf
diff --git a/trunk/sound/soc/mxs/mxs-saif.c b/trunk/sound/soc/mxs/mxs-saif.c
index c294fbb523fc..aa037b292f3d 100644
--- a/trunk/sound/soc/mxs/mxs-saif.c
+++ b/trunk/sound/soc/mxs/mxs-saif.c
@@ -523,24 +523,16 @@ static int mxs_saif_trigger(struct snd_pcm_substream *substream, int cmd,
 
 		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 			/*
-			 * write data to saif data register to trigger
-			 * the transfer.
-			 * For 24-bit format the 32-bit FIFO register stores
-			 * only one channel, so we need to write twice.
-			 * This is also safe for the other non 24-bit formats.
+			 * write a data to saif data register to trigger
+			 * the transfer
 			 */
 			__raw_writel(0, saif->base + SAIF_DATA);
-			__raw_writel(0, saif->base + SAIF_DATA);
 		} else {
 			/*
-			 * read data from saif data register to trigger
-			 * the receive.
-			 * For 24-bit format the 32-bit FIFO register stores
-			 * only one channel, so we need to read twice.
-			 * This is also safe for the other non 24-bit formats.
+			 * read a data from saif data register to trigger
+			 * the receive
 			 */
 			__raw_readl(saif->base + SAIF_DATA);
-			__raw_readl(saif->base + SAIF_DATA);
 		}
 
 		master_saif->ongoing = 1;
@@ -820,4 +812,3 @@ module_platform_driver(mxs_saif_driver);
 MODULE_AUTHOR("Freescale Semiconductor, Inc.");
 MODULE_DESCRIPTION("MXS ASoC SAIF driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:mxs-saif");
diff --git a/trunk/sound/soc/samsung/Kconfig b/trunk/sound/soc/samsung/Kconfig
index e7b83179aca2..fa166bd87edc 100644
--- a/trunk/sound/soc/samsung/Kconfig
+++ b/trunk/sound/soc/samsung/Kconfig
@@ -207,6 +207,7 @@ config SND_SOC_BELLS
 	select SND_SOC_WM5102
 	select SND_SOC_WM5110
 	select SND_SOC_WM9081
+	select SND_SOC_WM0010
 
 config SND_SOC_LOWLAND
 	tristate "Audio support for Wolfson Lowland"