From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 11 Aug 2009 12:09:27 +0000 (+0100)
Subject: Merge commit 'a5479e389e989acfeca9c32eeb0083d086202280' into for-2.6.32
X-Git-Tag: accepted/tizen/common/20141203.182822~13107^2~202^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1921bab217c2c21e4b8dc78332f6ae11515fc014;p=platform%2Fkernel%2Flinux-arm64.git

Merge commit 'a5479e389e989acfeca9c32eeb0083d086202280' into for-2.6.32
---

1921bab217c2c21e4b8dc78332f6ae11515fc014
diff --cc sound/soc/codecs/wm9081.c
index 1f51dd5,c965323..c147f2b
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@@ -1149,11 -1214,12 +1149,12 @@@ static int wm9081_set_sysclk(struct snd
  	return 0;
  }
  
+ /* FIXME: Needs to handle slot_width */
  static int wm9081_set_tdm_slot(struct snd_soc_dai *dai,
- 			       unsigned int mask, int slots)
+ 	unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width)
  {
  	struct snd_soc_codec *codec = dai->codec;
 -	unsigned int aif1 = wm9081_read(codec, WM9081_AUDIO_INTERFACE_1);
 +	unsigned int aif1 = snd_soc_read(codec, WM9081_AUDIO_INTERFACE_1);
  
  	aif1 &= ~(WM9081_AIFDAC_TDM_SLOT_MASK | WM9081_AIFDAC_TDM_MODE_MASK);