From 741c1e56fbbfc73d556d8affdb42107e3cad39fd Mon Sep 17 00:00:00 2001
From: Jassi Brar <jassi.brar@samsung.com>
Date: Tue, 27 Apr 2010 15:56:56 +0900
Subject: [PATCH] --- yaml --- r: 193430 b: refs/heads/master c:
 9e991a4bf3290b0787d33fa72144f6eec656f20d h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/sound/soc/s3c24xx/s3c-i2s-v2.h | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 73a783b162a2..32ab1671b0c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d47ef9c79dd46c1b33696f01b6cf744b77150379
+refs/heads/master: 9e991a4bf3290b0787d33fa72144f6eec656f20d
diff --git a/trunk/sound/soc/s3c24xx/s3c-i2s-v2.h b/trunk/sound/soc/s3c24xx/s3c-i2s-v2.h
index 39a6db6a565c..766f43a13d8b 100644
--- a/trunk/sound/soc/s3c24xx/s3c-i2s-v2.h
+++ b/trunk/sound/soc/s3c24xx/s3c-i2s-v2.h
@@ -29,10 +29,16 @@
 #define S3C_I2SV2_CLKSRC_AUDIOBUS	1
 #define S3C_I2SV2_CLKSRC_CDCLK		2
 
+/* Set this flag for I2S controllers that have the bit IISMOD[12]
+ * bridge/break RCLK signal and external Xi2sCDCLK pin.
+ */
+#define S3C_FEATURE_CDCLKCON	(1 << 0)
+
 /**
  * struct s3c_i2sv2_info - S3C I2S-V2 information
  * @dev: The parent device passed to use from the probe.
  * @regs: The pointer to the device registe block.
+ * @feature: Set of bit-flags indicating features of the controller.
  * @master: True if the I2S core is the I2S bit clock master.
  * @dma_playback: DMA information for playback channel.
  * @dma_capture: DMA information for capture channel.
@@ -47,6 +53,8 @@ struct s3c_i2sv2_info {
 	struct device	*dev;
 	void __iomem	*regs;
 
+	u32		feature;
+
 	struct clk	*iis_pclk;
 	struct clk	*iis_cclk;