diff options
author | Mark Brown <broonie@kernel.org> | 2020-07-17 00:51:52 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-07-17 00:51:52 +0200 |
commit | 5f52d4dda5bcfc37fba8338bd578ab1bd449f8bd (patch) | |
tree | d1422edf7cf4c4b3c46913a790c15b7e9673d8d2 /include/sound/max9768.h | |
parent | Merge series "ASoC: merge .digital_mute() into .mute_stream()" from Kuninori ... (diff) | |
parent | ASoC: fsl-asoc-card: Support Headphone and Microphone Jack detection (diff) | |
download | linux-5f52d4dda5bcfc37fba8338bd578ab1bd449f8bd.tar.xz linux-5f52d4dda5bcfc37fba8338bd578ab1bd449f8bd.zip |
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 'include/sound/max9768.h')
0 files changed, 0 insertions, 0 deletions