diff options
| author | Dylan Reid <dgreid@chromium.org> | 2015-05-22 15:09:20 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-05-25 13:11:45 +0100 |
| commit | e616d2eba6d1ac8f3268cdf5d7b0424072c89a8d (patch) | |
| tree | dd89f17a3a156552a3e58c616b6b1d40f829d010 /sound/soc/soc-jack.c | |
| parent | 1fb1e0ec9a8ab87985448e8b82b20884a186ec31 (diff) | |
| download | linux-e616d2eba6d1ac8f3268cdf5d7b0424072c89a8d.tar.bz2 | |
ASoC: jack - add_gpiods accepts filled descriptors
Allow for the desc field to be pre-filled when adding gpios to a jack.
This allows drivers to get the gpios and decide if they should be added
to the list or not. Specifically this will allow the gpio jack driver
to add gpios based on device property specifications.
Signed-off-by: Dylan Reid <dgreid@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-jack.c')
| -rw-r--r-- | sound/soc/soc-jack.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index 9f60c25c4568..171c4291ea21 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c @@ -315,8 +315,11 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, goto undo; } - if (gpios[i].gpiod_dev) { - /* GPIO descriptor */ + if (gpios[i].desc) { + /* Already have a GPIO descriptor. */ + goto got_gpio; + } else if (gpios[i].gpiod_dev) { + /* Get a GPIO descriptor */ gpios[i].desc = gpiod_get_index(gpios[i].gpiod_dev, gpios[i].name, gpios[i].idx, GPIOD_IN); @@ -344,7 +347,7 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, gpios[i].desc = gpio_to_desc(gpios[i].gpio); } - +got_gpio: INIT_DELAYED_WORK(&gpios[i].work, gpio_work); gpios[i].jack = jack; |