|
@@ -21,12 +21,16 @@
|
|
|
#include <linux/platform_device.h>
|
|
|
#include <sound/pcm.h>
|
|
|
#include <sound/pcm_params.h>
|
|
|
+#include <sound/jack.h>
|
|
|
#include <sound/soc.h>
|
|
|
+#include <uapi/linux/input-event-codes.h>
|
|
|
#include <dt-bindings/sound/apq8016-lpass.h>
|
|
|
|
|
|
struct apq8016_sbc_data {
|
|
|
void __iomem *mic_iomux;
|
|
|
void __iomem *spkr_iomux;
|
|
|
+ struct snd_soc_jack jack;
|
|
|
+ bool jack_setup;
|
|
|
struct snd_soc_dai_link dai_link[]; /* dynamically allocated */
|
|
|
};
|
|
|
|
|
@@ -70,6 +74,31 @@ static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd)
|
|
|
|
|
|
}
|
|
|
|
|
|
+ if (!pdata->jack_setup) {
|
|
|
+ struct snd_jack *jack;
|
|
|
+
|
|
|
+ rval = snd_soc_card_jack_new(card, "Headset Jack",
|
|
|
+ SND_JACK_HEADSET |
|
|
|
+ SND_JACK_HEADPHONE |
|
|
|
+ SND_JACK_BTN_0 | SND_JACK_BTN_1 |
|
|
|
+ SND_JACK_BTN_2 | SND_JACK_BTN_3 |
|
|
|
+ SND_JACK_BTN_4,
|
|
|
+ &pdata->jack, NULL, 0);
|
|
|
+
|
|
|
+ if (rval < 0) {
|
|
|
+ dev_err(card->dev, "Unable to add Headphone Jack\n");
|
|
|
+ return rval;
|
|
|
+ }
|
|
|
+
|
|
|
+ jack = pdata->jack.jack;
|
|
|
+
|
|
|
+ snd_jack_set_key(jack, SND_JACK_BTN_0, KEY_MEDIA);
|
|
|
+ snd_jack_set_key(jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);
|
|
|
+ snd_jack_set_key(jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
|
|
|
+ snd_jack_set_key(jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
|
|
|
+ pdata->jack_setup = true;
|
|
|
+ }
|
|
|
+
|
|
|
for (i = 0 ; i < dai_link->num_codecs; i++) {
|
|
|
struct snd_soc_dai *dai = rtd->codec_dais[i];
|
|
|
|
|
@@ -81,6 +110,11 @@ static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd)
|
|
|
dev_warn(card->dev, "Failed to set mclk: %d\n", rval);
|
|
|
return rval;
|
|
|
}
|
|
|
+ rval = snd_soc_codec_set_jack(codec, &pdata->jack, NULL);
|
|
|
+ if (rval != 0 && rval != -ENOTSUPP) {
|
|
|
+ dev_warn(card->dev, "Failed to set jack: %d\n", rval);
|
|
|
+ return rval;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return 0;
|