Unverified Commit bcd93822 authored by Tzung-Bi Shih's avatar Tzung-Bi Shih Committed by Mark Brown
Browse files

ASoC: max98357a: request GPIO when device get probed 



devm_gpiod_get_optional() returns EBUSY after component rebound.

Request GPIO in max98357a_platform_probe() to support component
rebinding.

Signed-off-by: default avatarTzung-Bi Shih <tzungbi@google.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 630be964

sound/soc/codecs/max98357a.c

+9 −20
Original line number Diff line number Diff line
@@ -59,21 +59,7 @@ static const struct snd_soc_dapm_route max98357a_dapm_routes[] = { 
	{"Speaker", NULL, "HiFi Playback"},

};



static int max98357a_component_probe(struct snd_soc_component *component)

{

	struct gpio_desc *sdmode;



	sdmode = devm_gpiod_get_optional(component->dev, "sdmode", GPIOD_OUT_LOW);

	if (IS_ERR(sdmode))

		return PTR_ERR(sdmode);



	snd_soc_component_set_drvdata(component, sdmode);



	return 0;

}



static const struct snd_soc_component_driver max98357a_component_driver = {

	.probe			= max98357a_component_probe,

	.dapm_widgets		= max98357a_dapm_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(max98357a_dapm_widgets),

	.dapm_routes		= max98357a_dapm_routes,
@@ -112,16 +98,20 @@ static struct snd_soc_dai_driver max98357a_dai_driver = { 


static int max98357a_platform_probe(struct platform_device *pdev)

{

	struct gpio_desc *sdmode;



	sdmode = devm_gpiod_get_optional(&pdev->dev,

				"sdmode", GPIOD_OUT_LOW);

	if (IS_ERR(sdmode))

		return PTR_ERR(sdmode);



	dev_set_drvdata(&pdev->dev, sdmode);



	return devm_snd_soc_register_component(&pdev->dev,

			&max98357a_component_driver,

			&max98357a_dai_driver, 1);

}



static int max98357a_platform_remove(struct platform_device *pdev)

{

	return 0;

}



#ifdef CONFIG_OF

static const struct of_device_id max98357a_device_id[] = {

	{ .compatible = "maxim,max98357a" },
@@ -145,7 +135,6 @@ static struct platform_driver max98357a_platform_driver = { 
		.acpi_match_table = ACPI_PTR(max98357a_acpi_match),

	},

	.probe	= max98357a_platform_probe,

	.remove = max98357a_platform_remove,

};

module_platform_driver(max98357a_platform_driver);