2 files changed, 13 insertions, 0 deletions

diff --git a/include/sound/wm8960.h b/include/sound/wm8960.h
index 74e9a95529c5..b5a1ab9ebb4a 100644
--- a/include/sound/wm8960.h
+++ b/include/sound/wm8960.h
@@ -19,6 +19,8 @@ struct wm8960_data {
         bool capless;  /* Headphone outputs configured in capless mode */
 
         int dres;  /* Discharge resistance for headphone outputs */
+
+        bool shared_lrclk;  /* DAC and ADC LRCLKs are wired together */
 };
 
 #endif
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 066250e3f7f4..782faa0a3b49 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -1036,6 +1036,7 @@ static const struct regmap_config wm8960_regmap = {
 static __devinit int wm8960_i2c_probe(struct i2c_client *i2c,
                                       const struct i2c_device_id *id)
 {
+        struct wm8960_data *pdata = dev_get_platdata(&i2c->dev);
         struct wm8960_priv *wm8960;
         int ret;
 
@@ -1048,6 +1049,16 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c,
         if (IS_ERR(wm8960->regmap))
                 return PTR_ERR(wm8960->regmap);
 
+        if (pdata && pdata->shared_lrclk) {
+                ret = regmap_update_bits(wm8960->regmap, WM8960_ADDCTL2,
+                                         0x4, 0x4);
+                if (ret != 0) {
+                        dev_err(&i2c->dev, "Failed to enable LRCM: %d\n",
+                                ret);
+                        return ret;
+                }
+        }
+
         i2c_set_clientdata(i2c, wm8960);
 
         ret = snd_soc_register_codec(&i2c->dev,