Unverified Commit 791667f7 authored by Mark Brown's avatar Mark Brown
Browse files

add es8326 dt-bindings, commonize headset codec 

Merge series from Rui Zhou <zhourui@huaqin.corp-partner.google.com>:

Add dt-bindings for es8326 and codec es8326 support.
Remove duplicate code, commonize headset codec init/exit API.
At the same time, Enable dual amp max98390 for rt5682s.
parents f51daa78 3423c3db

Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ allOf: 
properties:

  compatible:

    enum:

      - mediatek,mt8188-es8326

      - mediatek,mt8188-mt6359-evb

      - mediatek,mt8188-nau8825

      - mediatek,mt8188-rt5682s

sound/soc/mediatek/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ config SND_SOC_MT8188_MT6359 
	select SND_SOC_NAU8315

	select SND_SOC_NAU8825

	select SND_SOC_RT5682S

	select SND_SOC_ES8326

	help

	  This adds support for ASoC machine driver for MediaTek MT8188

	  boards with the MT6359 and other I2S audio codecs.

sound/soc/mediatek/mt8188/mt8188-mt6359.c

+61 −64
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 


#define NAU8825_HS_PRESENT	BIT(0)

#define RT5682S_HS_PRESENT	BIT(1)

#define ES8326_HS_PRESENT	BIT(2)

#define MAX98390_TWO_AMP	BIT(3)

/*

 * Maxim MAX98390

 */
@@ -48,6 +50,11 @@ 
 */

#define NAU8825_CODEC_DAI  "nau8825-hifi"



/*

 * ES8326

 */

#define ES8326_CODEC_DAI  "ES8326 HiFi"



#define SOF_DMA_DL2 "SOF_DMA_DL2"

#define SOF_DMA_DL3 "SOF_DMA_DL3"

#define SOF_DMA_UL4 "SOF_DMA_UL4"
@@ -726,7 +733,7 @@ static int mt8188_max98390_codec_init(struct snd_soc_pcm_runtime *rtd) 
	return 0;

}



static int mt8188_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)

static int mt8188_headset_codec_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(card);
@@ -775,68 +782,13 @@ static int mt8188_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) 
	return 0;

};



static int mt8188_rt5682s_codec_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(card);

	struct mt8188_mt6359_priv *priv = soc_card_data->mach_priv;

	struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component;

	struct snd_soc_jack *jack = &priv->headset_jack;

	int ret;



	ret = snd_soc_dapm_new_controls(&card->dapm, mt8188_nau8825_widgets,

					ARRAY_SIZE(mt8188_nau8825_widgets));

	if (ret) {

		dev_err(rtd->dev, "unable to add rt5682s card widget, ret %d\n", ret);

		return ret;

	}



	ret = snd_soc_add_card_controls(card, mt8188_nau8825_controls,

					ARRAY_SIZE(mt8188_nau8825_controls));

	if (ret) {

		dev_err(rtd->dev, "unable to add rt5682s card controls, ret %d\n", ret);

		return ret;

	}



	ret = snd_soc_card_jack_new_pins(rtd->card, "Headset Jack",

					 SND_JACK_HEADSET | SND_JACK_BTN_0 |

					 SND_JACK_BTN_1 | SND_JACK_BTN_2 |

					 SND_JACK_BTN_3,

					 jack,

					 nau8825_jack_pins,

					 ARRAY_SIZE(nau8825_jack_pins));

	if (ret) {

		dev_err(rtd->dev, "Headset Jack creation failed: %d\n", ret);

		return ret;

	}



	snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);

	ret = snd_soc_component_set_jack(component, jack, NULL);



	if (ret) {

		dev_err(rtd->dev, "Headset Jack call-back failed: %d\n", ret);

		return ret;

	}



	return 0;

};



static void mt8188_nau8825_codec_exit(struct snd_soc_pcm_runtime *rtd)

static void mt8188_headset_codec_exit(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component;



	snd_soc_component_set_jack(component, NULL, NULL);

}



static void mt8188_rt5682s_codec_exit(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component;



	snd_soc_component_set_jack(component, NULL, NULL);

}



static int mt8188_nau8825_hw_params(struct snd_pcm_substream *substream,

				    struct snd_pcm_hw_params *params)
@@ -943,6 +895,30 @@ static const struct snd_soc_ops mt8188_sof_be_ops = { 
	.hw_params = mt8188_sof_be_hw_params,

};



static int mt8188_es8326_hw_params(struct snd_pcm_substream *substream,

				 struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);

	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);

	unsigned int rate = params_rate(params);

	int ret;



	/* Configure MCLK for codec */

	ret = snd_soc_dai_set_sysclk(codec_dai, 0, rate * 256, SND_SOC_CLOCK_IN);

	if (ret < 0) {

		dev_err(codec_dai->dev, "can't set MCLK %d\n", ret);

		return ret;

	}



	/* Configure MCLK for cpu */

	return snd_soc_dai_set_sysclk(cpu_dai, 0, rate * 256, SND_SOC_CLOCK_OUT);

}



static const struct snd_soc_ops mt8188_es8326_ops = {

	.hw_params = mt8188_es8326_hw_params,

};



static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {

	/* FE */

	[DAI_LINK_DL2_FE] = {
@@ -1252,7 +1228,7 @@ static void mt8188_fixup_controls(struct snd_soc_card *card) 
	struct mt8188_card_data *card_data = (struct mt8188_card_data *)priv->private_data;

	struct snd_kcontrol *kctl;



	if (card_data->quirk & (NAU8825_HS_PRESENT | RT5682S_HS_PRESENT)) {

	if (card_data->quirk & (NAU8825_HS_PRESENT | RT5682S_HS_PRESENT | ES8326_HS_PRESENT)) {

		struct snd_soc_dapm_widget *w, *next_w;



		for_each_card_widgets_safe(card, w, next_w) {
@@ -1293,6 +1269,7 @@ static int mt8188_mt6359_dev_probe(struct platform_device *pdev) 
	struct mt8188_card_data *card_data;

	struct snd_soc_dai_link *dai_link;

	bool init_mt6359 = false;

	bool init_es8326 = false;

	bool init_nau8825 = false;

	bool init_rt5682s = false;

	bool init_max98390 = false;
@@ -1399,7 +1376,14 @@ static int mt8188_mt6359_dev_probe(struct platform_device *pdev) 
			   strcmp(dai_link->name, "ETDM1_IN_BE") == 0 ||

			   strcmp(dai_link->name, "ETDM2_IN_BE") == 0) {

			if (!strcmp(dai_link->codecs->dai_name, MAX98390_CODEC_DAI)) {

				/*

				 * The TDM protocol settings with fixed 4 slots are defined in

				 * mt8188_max98390_ops. Two amps is I2S mode,

				 * SOC and codec don't require TDM settings.

				 */

				if (!(card_data->quirk & MAX98390_TWO_AMP)) {

					dai_link->ops = &mt8188_max98390_ops;

				}

				if (!init_max98390) {

					dai_link->init = mt8188_max98390_codec_init;

					init_max98390 = true;
@@ -1407,17 +1391,24 @@ static int mt8188_mt6359_dev_probe(struct platform_device *pdev) 
			} else if (!strcmp(dai_link->codecs->dai_name, NAU8825_CODEC_DAI)) {

				dai_link->ops = &mt8188_nau8825_ops;

				if (!init_nau8825) {

					dai_link->init = mt8188_nau8825_codec_init;

					dai_link->exit = mt8188_nau8825_codec_exit;

					dai_link->init = mt8188_headset_codec_init;

					dai_link->exit = mt8188_headset_codec_exit;

					init_nau8825 = true;

				}

			} else if (!strcmp(dai_link->codecs->dai_name, RT5682S_CODEC_DAI)) {

				dai_link->ops = &mt8188_rt5682s_i2s_ops;

				if (!init_rt5682s) {

					dai_link->init = mt8188_rt5682s_codec_init;

					dai_link->exit = mt8188_rt5682s_codec_exit;

					dai_link->init = mt8188_headset_codec_init;

					dai_link->exit = mt8188_headset_codec_exit;

					init_rt5682s = true;

				}

			} else if (!strcmp(dai_link->codecs->dai_name, ES8326_CODEC_DAI)) {

				dai_link->ops = &mt8188_es8326_ops;

				if (!init_es8326) {

					dai_link->init = mt8188_headset_codec_init;

					dai_link->exit = mt8188_headset_codec_exit;

					init_es8326 = true;

				}

			} else {

				if (strcmp(dai_link->codecs->dai_name, "snd-soc-dummy-dai")) {

					if (!init_dumb) {
@@ -1457,13 +1448,19 @@ static struct mt8188_card_data mt8188_nau8825_card = { 


static struct mt8188_card_data mt8188_rt5682s_card = {

	.name = "mt8188_rt5682s",

	.quirk = RT5682S_HS_PRESENT,

	.quirk = RT5682S_HS_PRESENT | MAX98390_TWO_AMP,

};



static struct mt8188_card_data mt8188_es8326_card = {

	.name = "mt8188_es8326",

	.quirk = ES8326_HS_PRESENT | MAX98390_TWO_AMP,

};



static const struct of_device_id mt8188_mt6359_dt_match[] = {

	{ .compatible = "mediatek,mt8188-mt6359-evb", .data = &mt8188_evb_card, },

	{ .compatible = "mediatek,mt8188-nau8825", .data = &mt8188_nau8825_card, },

	{ .compatible = "mediatek,mt8188-rt5682s", .data = &mt8188_rt5682s_card, },

	{ .compatible = "mediatek,mt8188-es8326", .data = &mt8188_es8326_card, },

	{ /* sentinel */ },

};

MODULE_DEVICE_TABLE(of, mt8188_mt6359_dt_match);