ASoC: mediatek: mt8183: move headset jack to card-specific storage (95d779b4) · Commits · 戴 / test

sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -15,8 +15,6 @@
		#include "mt8183-afe-common.h"
		#include "../../codecs/ts3a227e.h"

		static struct snd_soc_jack headset_jack;

		enum PINCTRL_PIN_STATE {
		PIN_STATE_DEFAULT = 0,
		PIN_TDM_OUT_ON,
		@@ -31,6 +29,7 @@ static const char * const mt8183_pin_str[PIN_STATE_MAX] = {
		struct mt8183_mt6358_ts3a227_max98357_priv {
		struct pinctrl *pinctrl;
		struct pinctrl_state *pin_states[PIN_STATE_MAX];
		struct snd_soc_jack headset_jack;
		};

		static int mt8183_mt6358_i2s_hw_params(struct snd_pcm_substream *substream,
		@@ -410,6 +409,8 @@ static int
		mt8183_mt6358_ts3a227_max98357_headset_init(struct snd_soc_component *component)
		{
		int ret;
		struct mt8183_mt6358_ts3a227_max98357_priv *priv =
		snd_soc_card_get_drvdata(component->card);

		/* Enable Headset and 4 Buttons Jack detection */
		ret = snd_soc_card_jack_new(&mt8183_mt6358_ts3a227_max98357_card,
		@@ -417,12 +418,12 @@ mt8183_mt6358_ts3a227_max98357_headset_init(struct snd_soc_component *component)
		SND_JACK_HEADSET \|
		SND_JACK_BTN_0 \| SND_JACK_BTN_1 \|
		SND_JACK_BTN_2 \| SND_JACK_BTN_3,
		&headset_jack,
		&priv->headset_jack,
		NULL, 0);
		if (ret)
		return ret;

		ret = ts3a227e_enable_jack_detect(component, &headset_jack);
		ret = ts3a227e_enable_jack_detect(component, &priv->headset_jack);

		return ret;
		}