Merge "asoc: sm6150: Remove zdet gpio callback for tasha variant" (48d488c1) · Commits · e / devices / android_kernel_oneplus_sm7250

asoc/sm6150.c

+0 −23

Original line number	Diff line number	Diff line
		@@ -4760,28 +4760,6 @@ static void msm_afe_clear_config(void)
		afe_clear_config(AFE_SLIMBUS_SLAVE_CONFIG);
		}

		static int msm_config_hph_en0_gpio(struct snd_soc_component *component, bool high)
		{
		struct snd_soc_card *card = component->card;
		struct msm_asoc_mach_data *pdata;
		int val;

		if (!card)
		return 0;

		pdata = snd_soc_card_get_drvdata(card);
		if (!pdata \|\| !gpio_is_valid(pdata->hph_en0_gpio))
		return 0;

		val = gpio_get_value_cansleep(pdata->hph_en0_gpio);
		if ((!!val) == high)
		return 0;

		gpio_direction_output(pdata->hph_en0_gpio, (int)high);

		return 1;
		}

		static int msm_audrx_tavil_init(struct snd_soc_pcm_runtime *rtd)
		{
		int ret = 0;
		@@ -5103,7 +5081,6 @@ static int msm_audrx_tasha_init(struct snd_soc_pcm_runtime *rtd)
		pdata->codec_root = entry;
		}
		tasha_codec_info_create_codec_entry(pdata->codec_root, component);
		tasha_mbhc_zdet_gpio_ctrl(msm_config_hph_en0_gpio, component);

		codec_reg_done = true;
		return 0;