diff options
| author | Tzung-Bi Shih <tzungbi@google.com> | 2019-05-09 11:04:54 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-13 12:43:29 +0100 |
| commit | bcd9382288af236321c83d27b0db196bf8814559 (patch) | |
| tree | 1196a9f92a8086d84e7831c1ea0e67d39e9c0ea7 /sound/soc/codecs/max98357a.c | |
| parent | 630be964b5d8d37d3dff9fc5c8af8a516aa94af0 (diff) | |
| download | talos-op-linux-bcd9382288af236321c83d27b0db196bf8814559.tar.gz talos-op-linux-bcd9382288af236321c83d27b0db196bf8814559.zip | |
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: Tzung-Bi Shih <tzungbi@google.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/max98357a.c')
| -rw-r--r-- | sound/soc/codecs/max98357a.c | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/sound/soc/codecs/max98357a.c b/sound/soc/codecs/max98357a.c index d037a3e4d323..80080a6415b3 100644 --- a/sound/soc/codecs/max98357a.c +++ b/sound/soc/codecs/max98357a.c @@ -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); |
