Unverified Commit e3e32993 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: mt8192: Fixes from initial glance at kselftest 

Merge series from Mark Brown <broonie@kernel.org>:

This is a collection of fixes I came up after glancing through an
initial test run with the Spherion Chromebook on KernelCI.  There are
more issues flagged, this is just what I fixed thus far - the volume
controls on the MT6359 have issues for example, and a lot of controls
aren't marked as Switches like they should be.
parents d52279d5 ce40d93b

sound/soc/mediatek/mt8192/mt8192-dai-adda.c

+19 −39
Original line number Diff line number Diff line
@@ -303,9 +303,6 @@ static int mtk_adda_ul_event(struct snd_soc_dapm_widget *w, 
	struct mt8192_afe_private *afe_priv = afe->platform_priv;

	int mtkaif_dmic = afe_priv->mtkaif_dmic;



	dev_info(afe->dev, "%s(), name %s, event 0x%x, mtkaif_dmic %d\n",

		 __func__, w->name, event, mtkaif_dmic);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		mt8192_afe_gpio_request(afe->dev, true, MT8192_DAI_ADDA, 1);
@@ -345,10 +342,6 @@ static int mtk_adda_ch34_ul_event(struct snd_soc_dapm_widget *w, 
	int mtkaif_dmic = afe_priv->mtkaif_dmic_ch34;

	int mtkaif_adda6_only = afe_priv->mtkaif_adda6_only;



	dev_info(afe->dev,

		 "%s(), name %s, event 0x%x, mtkaif_dmic %d, mtkaif_adda6_only %d\n",

		 __func__, w->name, event, mtkaif_dmic, mtkaif_adda6_only);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		mt8192_afe_gpio_request(afe->dev, true, MT8192_DAI_ADDA_CH34,
@@ -538,9 +531,6 @@ static int mtk_adda_dl_event(struct snd_soc_dapm_widget *w, 
	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt);



	dev_info(afe->dev, "%s(), name %s, event 0x%x\n",

		 __func__, w->name, event);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		mt8192_afe_gpio_request(afe->dev, true, MT8192_DAI_ADDA, 0);
@@ -564,9 +554,6 @@ static int mtk_adda_ch34_dl_event(struct snd_soc_dapm_widget *w, 
	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt);



	dev_info(afe->dev, "%s(), name %s, event 0x%x\n",

		 __func__, w->name, event);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		mt8192_afe_gpio_request(afe->dev, true, MT8192_DAI_ADDA_CH34,
@@ -604,19 +591,21 @@ static int stf_positive_gain_set(struct snd_kcontrol *kcontrol, 
	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt);

	struct mt8192_afe_private *afe_priv = afe->platform_priv;

	int gain_db = ucontrol->value.integer.value[0];

	bool change = false;



	afe_priv->stf_positive_gain_db = gain_db;



	if (gain_db >= 0 && gain_db <= 24) {

		regmap_update_bits(afe->regmap,

		regmap_update_bits_check(afe->regmap,

					 AFE_SIDETONE_GAIN,

					 POSITIVE_GAIN_MASK_SFT,

				   (gain_db / 6) << POSITIVE_GAIN_SFT);

					 (gain_db / 6) << POSITIVE_GAIN_SFT,

					 &change);

	} else {

		dev_warn(afe->dev, "%s(), gain_db %d invalid\n",

			 __func__, gain_db);

		return -EINVAL;

	}

	return 0;



	return change;

}



static int mt8192_adda_dmic_get(struct snd_kcontrol *kcontrol,
@@ -637,15 +626,17 @@ static int mt8192_adda_dmic_set(struct snd_kcontrol *kcontrol, 
	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt);

	struct mt8192_afe_private *afe_priv = afe->platform_priv;

	int dmic_on;

	bool change;



	dmic_on = ucontrol->value.integer.value[0];



	dev_info(afe->dev, "%s(), kcontrol name %s, dmic_on %d\n",

		 __func__, kcontrol->id.name, dmic_on);

	change = (afe_priv->mtkaif_dmic != dmic_on) ||

		(afe_priv->mtkaif_dmic_ch34 != dmic_on);



	afe_priv->mtkaif_dmic = dmic_on;

	afe_priv->mtkaif_dmic_ch34 = dmic_on;

	return 0;



	return change;

}



static int mt8192_adda6_only_get(struct snd_kcontrol *kcontrol,
@@ -666,20 +657,20 @@ static int mt8192_adda6_only_set(struct snd_kcontrol *kcontrol, 
	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt);

	struct mt8192_afe_private *afe_priv = afe->platform_priv;

	int mtkaif_adda6_only;

	bool change;



	mtkaif_adda6_only = ucontrol->value.integer.value[0];



	dev_info(afe->dev, "%s(), kcontrol name %s, mtkaif_adda6_only %d\n",

		 __func__, kcontrol->id.name, mtkaif_adda6_only);



	change = afe_priv->mtkaif_adda6_only != mtkaif_adda6_only;

	afe_priv->mtkaif_adda6_only = mtkaif_adda6_only;

	return 0;



	return change;

}



static const struct snd_kcontrol_new mtk_adda_controls[] = {

	SOC_SINGLE("Sidetone_Gain", AFE_SIDETONE_GAIN,

		   SIDE_TONE_GAIN_SFT, SIDE_TONE_GAIN_MASK, 0),

	SOC_SINGLE_EXT("Sidetone_Positive_Gain_dB", SND_SOC_NOPM, 0, 100, 0,

	SOC_SINGLE_EXT("Sidetone_Positive_Gain_dB", SND_SOC_NOPM, 0, 24, 0,

		       stf_positive_gain_get, stf_positive_gain_set),

	SOC_SINGLE("ADDA_DL_GAIN", AFE_ADDA_DL_SRC2_CON1,

		   DL_2_GAIN_CTL_PRE_SFT, DL_2_GAIN_CTL_PRE_MASK, 0),
@@ -750,9 +741,6 @@ static int mtk_stf_event(struct snd_soc_dapm_widget *w, 


	regmap_read(afe->regmap, AFE_SIDETONE_CON1, &reg_value);



	dev_info(afe->dev, "%s(), name %s, event 0x%x, ul_rate 0x%x, AFE_SIDETONE_CON1 0x%x\n",

		 __func__, w->name, event, ul_rate, reg_value);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		/* set side tone gain = 0 */
@@ -1163,12 +1151,6 @@ static int mtk_dai_adda_hw_params(struct snd_pcm_substream *substream, 
	unsigned int rate = params_rate(params);

	int id = dai->id;



	dev_info(afe->dev, "%s(), id %d, stream %d, rate %d\n",

		 __func__,

		 id,

		 substream->stream,

		 rate);



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

		unsigned int dl_src2_con0 = 0;

		unsigned int dl_src2_con1 = 0;
@@ -1441,8 +1423,6 @@ int mt8192_dai_adda_register(struct mtk_base_afe *afe) 
	struct mtk_base_afe_dai *dai;

	struct mt8192_afe_private *afe_priv = afe->platform_priv;



	dev_info(afe->dev, "%s()\n", __func__);



	dai = devm_kzalloc(afe->dev, sizeof(*dai), GFP_KERNEL);

	if (!dai)

		return -ENOMEM;