104 lines
3.3 KiB
Diff
104 lines
3.3 KiB
Diff
|
From 7e23f30143f2f44b859aa424d27115a966f785bc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Anton Bambura <jenneron@protonmail.com>
|
||
|
|
Date: Sat, 10 Feb 2024 03:35:48 +0200
|
||
|
|
Subject: [PATCH] Revert "ASoC: mediatek: mt8183-da7219-max98357: Map missing
|
||
|
|
jack kcontrols"
|
||
|
|
|
||
|
|
This reverts commit 9c7388baa2053f333dc524814be4d95f0c2c8ae7.
|
||
|
|
---
|
||
|
|
.../mediatek/mt8183/mt8183-da7219-max98357.c | 43 +++----------------
|
||
|
|
1 file changed, 7 insertions(+), 36 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
|
||
|
|
index acaf81fd6c9b..195962f02471 100644
|
||
|
|
--- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
|
||
|
|
+++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
|
||
|
|
@@ -29,21 +29,6 @@ struct mt8183_da7219_max98357_priv {
|
||
|
|
struct snd_soc_jack headset_jack, hdmi_jack;
|
||
|
|
};
|
||
|
|
|
||
|
|
-static struct snd_soc_jack_pin mt8183_da7219_max98357_jack_pins[] = {
|
||
|
|
- {
|
||
|
|
- .pin = "Headphone",
|
||
|
|
- .mask = SND_JACK_HEADPHONE,
|
||
|
|
- },
|
||
|
|
- {
|
||
|
|
- .pin = "Headset Mic",
|
||
|
|
- .mask = SND_JACK_MICROPHONE,
|
||
|
|
- },
|
||
|
|
- {
|
||
|
|
- .pin = "Line Out",
|
||
|
|
- .mask = SND_JACK_LINEOUT,
|
||
|
|
- },
|
||
|
|
-};
|
||
|
|
-
|
||
|
|
static int mt8183_mt6358_i2s_hw_params(struct snd_pcm_substream *substream,
|
||
|
|
struct snd_pcm_hw_params *params)
|
||
|
|
{
|
||
|
|
@@ -587,15 +572,13 @@ mt8183_da7219_max98357_headset_init(struct snd_soc_component *component)
|
||
|
|
snd_soc_card_get_drvdata(component->card);
|
||
|
|
|
||
|
|
/* Enable Headset and 4 Buttons Jack detection */
|
||
|
|
- ret = snd_soc_card_jack_new_pins(component->card,
|
||
|
|
- "Headset Jack",
|
||
|
|
- SND_JACK_HEADSET |
|
||
|
|
- SND_JACK_BTN_0 | SND_JACK_BTN_1 |
|
||
|
|
- SND_JACK_BTN_2 | SND_JACK_BTN_3 |
|
||
|
|
- SND_JACK_LINEOUT,
|
||
|
|
- &priv->headset_jack,
|
||
|
|
- mt8183_da7219_max98357_jack_pins,
|
||
|
|
- ARRAY_SIZE(mt8183_da7219_max98357_jack_pins));
|
||
|
|
+ ret = snd_soc_card_jack_new(component->card,
|
||
|
|
+ "Headset Jack",
|
||
|
|
+ SND_JACK_HEADSET |
|
||
|
|
+ SND_JACK_BTN_0 | SND_JACK_BTN_1 |
|
||
|
|
+ SND_JACK_BTN_2 | SND_JACK_BTN_3 |
|
||
|
|
+ SND_JACK_LINEOUT,
|
||
|
|
+ &priv->headset_jack);
|
||
|
|
if (ret)
|
||
|
|
return ret;
|
||
|
|
|
||
|
|
@@ -626,18 +609,12 @@ static struct snd_soc_codec_conf mt6358_codec_conf[] = {
|
||
|
|
};
|
||
|
|
|
||
|
|
static const struct snd_kcontrol_new mt8183_da7219_max98357_snd_controls[] = {
|
||
|
|
- SOC_DAPM_PIN_SWITCH("Headphone"),
|
||
|
|
- SOC_DAPM_PIN_SWITCH("Headset Mic"),
|
||
|
|
SOC_DAPM_PIN_SWITCH("Speakers"),
|
||
|
|
- SOC_DAPM_PIN_SWITCH("Line Out"),
|
||
|
|
};
|
||
|
|
|
||
|
|
static const
|
||
|
|
struct snd_soc_dapm_widget mt8183_da7219_max98357_dapm_widgets[] = {
|
||
|
|
- SND_SOC_DAPM_HP("Headphone", NULL),
|
||
|
|
- SND_SOC_DAPM_MIC("Headset Mic", NULL),
|
||
|
|
SND_SOC_DAPM_SPK("Speakers", NULL),
|
||
|
|
- SND_SOC_DAPM_SPK("Line Out", NULL),
|
||
|
|
SND_SOC_DAPM_PINCTRL("TDM_OUT_PINCTRL",
|
||
|
|
"aud_tdm_out_on", "aud_tdm_out_off"),
|
||
|
|
};
|
||
|
|
@@ -680,20 +657,14 @@ static struct snd_soc_codec_conf mt8183_da7219_rt1015_codec_conf[] = {
|
||
|
|
};
|
||
|
|
|
||
|
|
static const struct snd_kcontrol_new mt8183_da7219_rt1015_snd_controls[] = {
|
||
|
|
- SOC_DAPM_PIN_SWITCH("Headphone"),
|
||
|
|
- SOC_DAPM_PIN_SWITCH("Headset Mic"),
|
||
|
|
SOC_DAPM_PIN_SWITCH("Left Spk"),
|
||
|
|
SOC_DAPM_PIN_SWITCH("Right Spk"),
|
||
|
|
- SOC_DAPM_PIN_SWITCH("Line Out"),
|
||
|
|
};
|
||
|
|
|
||
|
|
static const
|
||
|
|
struct snd_soc_dapm_widget mt8183_da7219_rt1015_dapm_widgets[] = {
|
||
|
|
- SND_SOC_DAPM_HP("Headphone", NULL),
|
||
|
|
- SND_SOC_DAPM_MIC("Headset Mic", NULL),
|
||
|
|
SND_SOC_DAPM_SPK("Left Spk", NULL),
|
||
|
|
SND_SOC_DAPM_SPK("Right Spk", NULL),
|
||
|
|
- SND_SOC_DAPM_LINE("Line Out", NULL),
|
||
|
|
SND_SOC_DAPM_PINCTRL("TDM_OUT_PINCTRL",
|
||
|
|
"aud_tdm_out_on", "aud_tdm_out_off"),
|
||
|
|
};
|
||
|
|
--
|
||
|
|
2.43.0
|
||
|
|
|