diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-17 17:37:28 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-17 17:37:28 +0000 |
| commit | 67c7efad9a64e9d58a6259332c344ab433f706eb (patch) | |
| tree | 70f42c8e9bbc36c305eaa5bda19b98c07bce39c8 /sound/soc/codecs/twl6040.h | |
| parent | 24ff33ac696802e478714480f505c00a50a89c75 (diff) | |
| parent | 991e02b4469c2e92cc98aa5b04fbde981671b74c (diff) | |
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/twl6040.h')
| -rw-r--r-- | sound/soc/codecs/twl6040.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/codecs/twl6040.h b/sound/soc/codecs/twl6040.h index f7c77fa58a3c..23aeed0963e6 100644 --- a/sound/soc/codecs/twl6040.h +++ b/sound/soc/codecs/twl6040.h @@ -79,6 +79,7 @@ /* INTMR (0x04) fields */ +#define TWL6040_PLUGMSK 0x02 #define TWL6040_READYMSK 0x40 #define TWL6040_ALLINT_MSK 0x7B @@ -135,4 +136,11 @@ #define TWL6040_HPPLL_ID 1 #define TWL6040_LPPLL_ID 2 +/* STATUS (0x2E) fields */ + +#define TWL6040_PLUGCOMP 0x02 + +void twl6040_hs_jack_detect(struct snd_soc_codec *codec, + struct snd_soc_jack *jack, int report); + #endif /* End of __TWL6040_H__ */ |