Unverified Commit de8fc2b0 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Mark Brown
Browse files

ASoC: tegra: Restore AC97 support 



The device-tree of AC97 codecs need to be parsed differently from I2S
codecs, plus codec device may need to be created. This was missed by the
patch that unified machine drivers into a single driver, fix it. It should
restore audio on Toradex Colibri board.

Cc: <stable@vger.kernel.org>
Fixes: cc8f70f5 ("ASoC: tegra: Unify ASoC machine drivers")
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20211024192853.21957-1-digetx@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8b27cb2e

sound/soc/tegra/tegra_asoc_machine.c

+49 −10
Original line number Diff line number Diff line
@@ -341,9 +341,34 @@ tegra_machine_parse_phandle(struct device *dev, const char *name) 
	return np;

}



static void tegra_machine_unregister_codec(void *pdev)

{

	platform_device_unregister(pdev);

}



static int tegra_machine_register_codec(struct device *dev, const char *name)

{

	struct platform_device *pdev;

	int err;



	if (!name)

		return 0;



	pdev = platform_device_register_simple(name, -1, NULL, 0);

	if (IS_ERR(pdev))

		return PTR_ERR(pdev);



	err = devm_add_action_or_reset(dev, tegra_machine_unregister_codec,

				       pdev);

	if (err)

		return err;



	return 0;

}



int tegra_asoc_machine_probe(struct platform_device *pdev)

{

	struct device_node *np_codec, *np_i2s;

	struct device_node *np_codec, *np_i2s, *np_ac97;

	const struct tegra_asoc_data *asoc;

	struct device *dev = &pdev->dev;

	struct tegra_machine *machine;
@@ -404,6 +429,18 @@ int tegra_asoc_machine_probe(struct platform_device *pdev) 
			return err;

	}



	if (asoc->set_ac97) {

		err = tegra_machine_register_codec(dev, asoc->codec_dev_name);

		if (err)

			return err;



		np_ac97 = tegra_machine_parse_phandle(dev, "nvidia,ac97-controller");

		if (IS_ERR(np_ac97))

			return PTR_ERR(np_ac97);



		card->dai_link->cpus->of_node = np_ac97;

		card->dai_link->platforms->of_node = np_ac97;

	} else {

		np_codec = tegra_machine_parse_phandle(dev, "nvidia,audio-codec");

		if (IS_ERR(np_codec))

			return PTR_ERR(np_codec);
@@ -415,6 +452,7 @@ int tegra_asoc_machine_probe(struct platform_device *pdev) 
		card->dai_link->cpus->of_node = np_i2s;

		card->dai_link->codecs->of_node = np_codec;

		card->dai_link->platforms->of_node = np_i2s;

	}



	if (asoc->add_common_controls) {

		card->controls = tegra_machine_controls;
@@ -589,6 +627,7 @@ static struct snd_soc_card snd_soc_tegra_wm9712 = { 
static const struct tegra_asoc_data tegra_wm9712_data = {

	.card = &snd_soc_tegra_wm9712,

	.add_common_dapm_widgets = true,

	.codec_dev_name = "wm9712-codec",

	.set_ac97 = true,

};

sound/soc/tegra/tegra_asoc_machine.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ struct snd_soc_pcm_runtime; 


struct tegra_asoc_data {

	unsigned int (*mclk_rate)(unsigned int srate);

	const char *codec_dev_name;

	struct snd_soc_card *card;

	unsigned int mclk_id;

	bool hp_jack_gpio_active_low;