OSDN Git Service

Merge series "ASoC: fsl-asoc-card: Support hp and mic detection" from Shengjiu Wang...
authorMark Brown <broonie@kernel.org>
Thu, 16 Jul 2020 22:51:52 +0000 (23:51 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 16 Jul 2020 22:51:52 +0000 (23:51 +0100)
commit5f52d4dda5bcfc37fba8338bd578ab1bd449f8bd
treed1422edf7cf4c4b3c46913a790c15b7e9673d8d2
parentbdd0c277d9846977ec3f175341d4e7475ed26ef7
parent3b171194493c5f7b2aa9b76deb402a8e98ab510f
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
sound/soc/fsl/fsl-asoc-card.c