From 5990bd670f4a31f800e6bdb26adbf148969fc31d Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Wed, 5 Dec 2012 18:20:38 +0100
Subject: [PATCH] --- yaml --- r: 342920 b: refs/heads/master c:
 1b3bc060fb008ddd75fe60c876c24784a517c10c h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/sound/soc/davinci/davinci-mcasp.c | 15 +++++++++++++++
 trunk/sound/soc/davinci/davinci-mcasp.h |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2bca4a58bb35..5f841a2078f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba764b3def0b979fd22884779f1a02f701e3af72
+refs/heads/master: 1b3bc060fb008ddd75fe60c876c24784a517c10c
diff --git a/trunk/sound/soc/davinci/davinci-mcasp.c b/trunk/sound/soc/davinci/davinci-mcasp.c
index 1b0aac9dbf35..55e2bf652bef 100644
--- a/trunk/sound/soc/davinci/davinci-mcasp.c
+++ b/trunk/sound/soc/davinci/davinci-mcasp.c
@@ -593,6 +593,10 @@ static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, int div
 			       ACLKRDIV(div - 1), ACLKRDIV_MASK);
 		break;
 
+	case 2:		/* BCLK/LRCLK ratio */
+		dev->bclk_lrclk_ratio = div;
+		break;
+
 	default:
 		return -EINVAL;
 	}
@@ -625,6 +629,17 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev,
 	u32 rotate = (32 - word_length) / 4;
 	u32 mask = (1ULL << word_length) - 1;
 
+	/*
+	 * if s BCLK-to-LRCLK ratio has been configured via the set_clkdiv()
+	 * callback, take it into account here. That allows us to for example
+	 * send 32 bits per channel to the codec, while only 16 of them carry
+	 * audio payload.
+	 * The clock ratio is given for a full period of data (both left and
+	 * right channels), so it has to be divided by 2.
+	 */
+	if (dev->bclk_lrclk_ratio)
+		word_length = dev->bclk_lrclk_ratio / 2;
+
 	/* mapping of the XSSZ bit-field as described in the datasheet */
 	fmt = (word_length >> 1) - 1;
 
diff --git a/trunk/sound/soc/davinci/davinci-mcasp.h b/trunk/sound/soc/davinci/davinci-mcasp.h
index d2449a865fc2..0edd3b5a37fd 100644
--- a/trunk/sound/soc/davinci/davinci-mcasp.h
+++ b/trunk/sound/soc/davinci/davinci-mcasp.h
@@ -38,6 +38,7 @@ struct davinci_audio_dev {
 	u8	num_serializer;
 	u8	*serial_dir;
 	u8	version;
+	u8	bclk_lrclk_ratio;
 
 	/* McASP FIFO related */
 	u8	txnumevt;