diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2023-03-02 10:46:16 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-03-05 23:38:34 +0000 |
| commit | 4c2c935a278e53bf9a1713bb0a01ce299a994e9b (patch) | |
| tree | 4ac36053e7d8573ee4aa6286a1d7fc8ba74566e6 /sound/soc/qcom | |
| parent | 5ddcf9768f7a15da997259038c16a9e00c06aa87 (diff) | |
| download | linux-stable-4c2c935a278e53bf9a1713bb0a01ce299a994e9b.tar.gz linux-stable-4c2c935a278e53bf9a1713bb0a01ce299a994e9b.tar.bz2 linux-stable-4c2c935a278e53bf9a1713bb0a01ce299a994e9b.zip | |
ASoC: qcom: common: add kcontrol to jack pins
Add Kcontrol to jack pins so that device switch in ucm can be done correctly.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230302104616.26318-1-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/qcom')
| -rw-r--r-- | sound/soc/qcom/common.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c index 96fe80241fb4..c1f24af17506 100644 --- a/sound/soc/qcom/common.c +++ b/sound/soc/qcom/common.c @@ -180,6 +180,18 @@ err_put_np: } EXPORT_SYMBOL_GPL(qcom_snd_parse_of); +static struct snd_soc_jack_pin qcom_headset_jack_pins[] = { + /* Headset */ + { + .pin = "Mic Jack", + .mask = SND_JACK_MICROPHONE, + }, + { + .pin = "Headphone Jack", + .mask = SND_JACK_HEADPHONE, + }, +}; + int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd, struct snd_soc_jack *jack, bool *jack_setup) { @@ -189,13 +201,14 @@ int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd, int rval, i; if (!*jack_setup) { - rval = snd_soc_card_jack_new(card, "Headset Jack", + rval = snd_soc_card_jack_new_pins(card, "Headset Jack", SND_JACK_HEADSET | SND_JACK_LINEOUT | SND_JACK_MECHANICAL | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | SND_JACK_BTN_3 | SND_JACK_BTN_4 | SND_JACK_BTN_5, - jack); + jack, qcom_headset_jack_pins, + ARRAY_SIZE(qcom_headset_jack_pins)); if (rval < 0) { dev_err(card->dev, "Unable to add Headphone Jack\n"); |