diff options
| author | Mark Brown <broonie@kernel.org> | 2020-07-16 23:51:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-07-16 23:51:52 +0100 |
| commit | 5f52d4dda5bcfc37fba8338bd578ab1bd449f8bd (patch) | |
| tree | d1422edf7cf4c4b3c46913a790c15b7e9673d8d2 /Documentation/devicetree/bindings/sound | |
| parent | bdd0c277d9846977ec3f175341d4e7475ed26ef7 (diff) | |
| parent | 3b171194493c5f7b2aa9b76deb402a8e98ab510f (diff) | |
| download | linux-5f52d4dda5bcfc37fba8338bd578ab1bd449f8bd.tar.gz | |
Merge series "ASoC: fsl-asoc-card: Support hp and mic detection" from Shengjiu Wang <shengjiu.wang@nxp.com>:
Support hp and mic detection.
Add a parameter for asoc_simple_init_jack.
Shengjiu Wang (3):
ASoC: simple-card-utils: Support configure pin_name for
asoc_simple_init_jack
ASoC: bindings: fsl-asoc-card: Support hp-det-gpio and mic-det-gpio
ASoC: fsl-asoc-card: Support Headphone and Microphone Jack detection
changes in v2:
- Add more comments in third commit
- Add Acked-by Nicolin.
.../bindings/sound/fsl-asoc-card.txt | 3 +
include/sound/simple_card_utils.h | 6 +-
sound/soc/fsl/Kconfig | 1 +
sound/soc/fsl/fsl-asoc-card.c | 77 ++++++++++++++++++-
sound/soc/generic/simple-card-utils.c | 7 +-
5 files changed, 86 insertions(+), 8 deletions(-)
--
2.27.0
Diffstat (limited to 'Documentation/devicetree/bindings/sound')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/fsl-asoc-card.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt index 133d7e14a4d0..8a6a3d0fda5e 100644 --- a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt +++ b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt @@ -69,6 +69,9 @@ Optional properties: coexisting in order to support the old bindings of wm8962 and sgtl5000. + - hp-det-gpio : The GPIO that detect headphones are plugged in + - mic-det-gpio : The GPIO that detect microphones are plugged in + Optional unless SSI is selected as a CPU DAI: - mux-int-port : The internal port of the i.MX audio muxer (AUDMUX) |