diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-11-07 11:34:46 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-11-07 11:34:46 -0500 |
| commit | b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24 (patch) | |
| tree | b5fcb00387a838beb2bcf2f8ed2fd3d6d460c8ae /Documentation/sound/alsa/HD-Audio-Models.txt | |
| parent | e363bbac316ffb5daaf45d855f82680148cafe20 (diff) | |
| parent | 355e62f5ad12b005c862838156262eb2df2f8dff (diff) | |
Merge remote-tracking branch 'grant/devicetree/next' into for-next
Diffstat (limited to 'Documentation/sound/alsa/HD-Audio-Models.txt')
| -rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index f911e3656209..85c362d8ea34 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
| @@ -28,6 +28,7 @@ ALC269/270/275/276/28x/29x | |||
| 28 | alc269-dmic Enable ALC269(VA) digital mic workaround | 28 | alc269-dmic Enable ALC269(VA) digital mic workaround |
| 29 | alc271-dmic Enable ALC271X digital mic workaround | 29 | alc271-dmic Enable ALC271X digital mic workaround |
| 30 | inv-dmic Inverted internal mic workaround | 30 | inv-dmic Inverted internal mic workaround |
| 31 | headset-mic Indicates a combined headset (headphone+mic) jack | ||
| 31 | lenovo-dock Enables docking station I/O for some Lenovos | 32 | lenovo-dock Enables docking station I/O for some Lenovos |
| 32 | dell-headset-multi Headset jack, which can also be used as mic-in | 33 | dell-headset-multi Headset jack, which can also be used as mic-in |
| 33 | dell-headset-dock Headset jack (without mic-in), and also dock I/O | 34 | dell-headset-dock Headset jack (without mic-in), and also dock I/O |