diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/soc/codecs/twl6040.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/soc/codecs/twl6040.h')
| -rw-r--r-- | sound/soc/codecs/twl6040.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/codecs/twl6040.h b/sound/soc/codecs/twl6040.h index c472070a1da2..23aeed0963e6 100644 --- a/sound/soc/codecs/twl6040.h +++ b/sound/soc/codecs/twl6040.h | |||
| @@ -79,6 +79,7 @@ | |||
| 79 | 79 | ||
| 80 | /* INTMR (0x04) fields */ | 80 | /* INTMR (0x04) fields */ |
| 81 | 81 | ||
| 82 | #define TWL6040_PLUGMSK 0x02 | ||
| 82 | #define TWL6040_READYMSK 0x40 | 83 | #define TWL6040_READYMSK 0x40 |
| 83 | #define TWL6040_ALLINT_MSK 0x7B | 84 | #define TWL6040_ALLINT_MSK 0x7B |
| 84 | 85 | ||
| @@ -135,7 +136,11 @@ | |||
| 135 | #define TWL6040_HPPLL_ID 1 | 136 | #define TWL6040_HPPLL_ID 1 |
| 136 | #define TWL6040_LPPLL_ID 2 | 137 | #define TWL6040_LPPLL_ID 2 |
| 137 | 138 | ||
| 138 | extern struct snd_soc_dai twl6040_dai; | 139 | /* STATUS (0x2E) fields */ |
| 139 | extern struct snd_soc_codec_device soc_codec_dev_twl6040; | 140 | |
| 141 | #define TWL6040_PLUGCOMP 0x02 | ||
| 142 | |||
| 143 | void twl6040_hs_jack_detect(struct snd_soc_codec *codec, | ||
| 144 | struct snd_soc_jack *jack, int report); | ||
| 140 | 145 | ||
| 141 | #endif /* End of __TWL6040_H__ */ | 146 | #endif /* End of __TWL6040_H__ */ |