Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aef9a37c authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

ASoC: tegra+alc5632: move all GPIO setup into probe 



Now that deferred probe exists, we can parse device tree and request
GPIOs from probe(), rather than deferring this to the DAI link's init().

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent e44fbbd4

sound/soc/tegra/tegra_alc5632.c

+6 −4
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd) 
{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	struct device_node *np = codec->card->dev->of_node;

	struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(codec->card);



	snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET,
@@ -119,8 +118,6 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd) 
			ARRAY_SIZE(tegra_alc5632_hs_jack_pins),

			tegra_alc5632_hs_jack_pins);



	machine->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0);



	if (gpio_is_valid(machine->gpio_hp_det)) {

		tegra_alc5632_hp_jack_gpio.gpio = machine->gpio_hp_det;

		snd_soc_jack_add_gpios(&tegra_alc5632_hs_jack,
@@ -159,6 +156,7 @@ static struct snd_soc_card snd_soc_tegra_alc5632 = { 


static __devinit int tegra_alc5632_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	struct snd_soc_card *card = &snd_soc_tegra_alc5632;

	struct tegra_alc5632 *alc5632;

	int ret;
@@ -181,6 +179,10 @@ static __devinit int tegra_alc5632_probe(struct platform_device *pdev) 
		goto err;

	}



	alc5632->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0);

	if (alc5632->gpio_hp_det == -ENODEV)

		return -EPROBE_DEFER;



	ret = snd_soc_of_parse_card_name(card, "nvidia,model");

	if (ret)

		goto err;