commit 6b9b03f9f58708d9eab9ea5d008d43e47be12209
author Joonwoo Park <joonwoop@codeaurora.org> Mon Jan 23 18:48:54 2012 -0800
committer Joonwoo Park <joonwoop@codeaurora.org> Wed Jan 25 22:09:26 2012 -0800
tree d63c619040421b18da85e677c22d55137f018975
parent f1bebfb79045e23b1d5ef9c807a6cf2da0de4eda

ASoC: wcd9310: Introduce MBHC multi button support

So far wcd9310 driver assumes that any headset button press is headset
button 0 press.
Change driver to measure voltage when button is pressed to discriminate and
notify button's number.

In order to have better detection performance, default measurement
samples are shortened.

CRs-fixed: 327081
Change-Id: Ic0e2a5297974e1858684f0ef2a0b424141ee7464
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>

sound/soc/codecs/wcd9310.h

diff --git a/sound/soc/codecs/wcd9310.h b/sound/soc/codecs/wcd9310.h
index 7f70010..6f77e9f 100644
--- a/sound/soc/codecs/wcd9310.h
+++ b/sound/soc/codecs/wcd9310.h
@@ -10,6 +10,7 @@
  * GNU General Public License for more details.
  */
 #include <sound/soc.h>
+#include <sound/jack.h>
 
 #define TABLA_VERSION_1_0	0
 #define TABLA_VERSION_1_1	1
@@ -28,6 +29,11 @@
 #define STA 0
 #define DCE 1
 
+#define TABLA_JACK_BUTTON_MASK (SND_JACK_BTN_0 | SND_JACK_BTN_1 | \
+				SND_JACK_BTN_2 | SND_JACK_BTN_3 | \
+				SND_JACK_BTN_4 | SND_JACK_BTN_5 | \
+				SND_JACK_BTN_6 | SND_JACK_BTN_7)
+
 extern const u8 tabla_reg_readable[TABLA_CACHE_SIZE];
 extern const u8 tabla_reg_defaults[TABLA_CACHE_SIZE];