diff options
| author | Rhyland Klein <rklein@nvidia.com> | 2012-03-15 23:07:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-01 12:28:24 +0200 |
| commit | 9dd90c5db0401061009183e6407feff3724ebc8b (patch) | |
| tree | 462b883850965aba52919f438474e5888f7de6a5 /include/sound | |
| parent | ASoC: pxa2xx-i2s: Add clk_prepare/clk_unprepare calls (diff) | |
| download | linux-9dd90c5db0401061009183e6407feff3724ebc8b.tar.xz linux-9dd90c5db0401061009183e6407feff3724ebc8b.zip | |
ASoC: max98095: add jack detection
This change adds the logic to support using the jack detect mechanism built
in to the codec to detect both when a jack was inserted and what type of
jack is present.
This change also supports the use of an external mechanism for headphone
detection. If this mechanism exists, when the max98095_jack_detect function
is called, the hp_jack is simply passed NULL.
This change supports both simple headphones, powered headphones, microphones
and headsets with both headphones and a mic.
Signed-off-by: Rhyland Klein <rklein@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/max98095.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/sound/max98095.h b/include/sound/max98095.h index 7513a42dd4aa..65b1c90f78ab 100644 --- a/include/sound/max98095.h +++ b/include/sound/max98095.h @@ -49,6 +49,18 @@ struct max98095_pdata { */ unsigned int digmic_left_mode:1; unsigned int digmic_right_mode:1; + + /* Pin5 is the mechanical method of sensing jack insertion + * but it is something that might not be supported. + * 0 = PIN5 not supported + * 1 = PIN5 supported + */ + int jack_detect_pin5en:1; + + /* Slew amount for jack detection. Calculated as 4 * (delay + 1). + * Default delay is 24 to get a time of 100ms. + */ + unsigned int jack_detect_delay; }; #endif |