From: "Andrew F. Davis" <afd@ti.com>
To: "Liam Girdwood" <lgirdwood@gmail.com>,
"Mark Brown" <broonie@kernel.org>,
"Rob Herring" <robh+dt@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
"Benoît Cousson" <bcousson@baylibre.com>,
"Tony Lindgren" <tony@atomide.com>
Cc: <alsa-devel@alsa-project.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 08/19] ASoC: tlv320aic31xx: Switch GPIO handling to use gpiod_* API
Date: Tue, 5 Dec 2017 15:23:49 -0600 [thread overview]
Message-ID: <17fcc926-9ee8-1229-ea3d-f38347cb9a23@ti.com> (raw)
In-Reply-To: <537c8d62-de11-15e8-11bc-08e8334d4322@ti.com>
On 12/04/2017 10:47 AM, Andrew F. Davis wrote:
> On 11/29/2017 03:32 PM, Andrew F. Davis wrote:
>> Move to using newer gpiod_* GPIO handling functions. This simplifies
>> the code and eases dropping platform data in the next patch. Also
>> remember GPIO are active low, so set "1" to reset.
>>
>> Signed-off-by: Andrew F. Davis <afd@ti.com>
>> ---
>
>
> Kbuild bot seems mad a this one, looks like I need to include
> linux/gpio/consumer.h, will fix for v3.
>
Looks like you already have this in your -next branch, how do you want
this fix, I can send a delta patch with the added include, a new v3
version that you can replace the patch in-tree with, or if it's easier
for you manually fix in-tree?
>
>> sound/soc/codecs/tlv320aic31xx.c | 23 ++++++++++-------------
>> 1 file changed, 10 insertions(+), 13 deletions(-)
>>
>> diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
>> index c84febd991a0..ab03a19f6aaa 100644
>> --- a/sound/soc/codecs/tlv320aic31xx.c
>> +++ b/sound/soc/codecs/tlv320aic31xx.c
>> @@ -157,6 +157,7 @@ struct aic31xx_priv {
>> u8 i2c_regs_status;
>> struct device *dev;
>> struct regmap *regmap;
>> + struct gpio_desc *gpio_reset;
>> struct aic31xx_pdata pdata;
>> struct regulator_bulk_data supplies[AIC31XX_NUM_SUPPLIES];
>> struct aic31xx_disable_nb disable_nb[AIC31XX_NUM_SUPPLIES];
>> @@ -1020,8 +1021,8 @@ static int aic31xx_regulator_event(struct notifier_block *nb,
>> * Put codec to reset and as at least one of the
>> * supplies was disabled.
>> */
>> - if (gpio_is_valid(aic31xx->pdata.gpio_reset))
>> - gpio_set_value(aic31xx->pdata.gpio_reset, 0);
>> + if (aic31xx->gpio_reset)
>> + gpiod_set_value(aic31xx->gpio_reset, 1);
>>
>> regcache_mark_dirty(aic31xx->regmap);
>> dev_dbg(aic31xx->dev, "## %s: DISABLE received\n", __func__);
>> @@ -1073,8 +1074,8 @@ static int aic31xx_power_on(struct snd_soc_codec *codec)
>> if (ret)
>> return ret;
>>
>> - if (gpio_is_valid(aic31xx->pdata.gpio_reset)) {
>> - gpio_set_value(aic31xx->pdata.gpio_reset, 1);
>> + if (aic31xx->gpio_reset) {
>> + gpiod_set_value(aic31xx->gpio_reset, 0);
>> udelay(100);
>> }
>> regcache_cache_only(aic31xx->regmap, false);
>> @@ -1334,15 +1335,11 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c,
>> else if (aic31xx->dev->of_node)
>> aic31xx_pdata_from_of(aic31xx);
>>
>> - if (aic31xx->pdata.gpio_reset) {
>> - ret = devm_gpio_request_one(aic31xx->dev,
>> - aic31xx->pdata.gpio_reset,
>> - GPIOF_OUT_INIT_HIGH,
>> - "aic31xx-reset-pin");
>> - if (ret < 0) {
>> - dev_err(aic31xx->dev, "not able to acquire gpio\n");
>> - return ret;
>> - }
>> + aic31xx->gpio_reset = devm_gpiod_get_optional(aic31xx->dev, "reset",
>> + GPIOD_OUT_LOW);
>> + if (IS_ERR(aic31xx->gpio_reset)) {
>> + dev_err(aic31xx->dev, "not able to acquire gpio\n");
>> + return PTR_ERR(aic31xx->gpio_reset);
>> }
>>
>> for (i = 0; i < ARRAY_SIZE(aic31xx->supplies); i++)
>>
next prev parent reply other threads:[~2017-12-05 21:25 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-29 21:32 [PATCH v2 00/19] Add Headphone Detection to TLV320AIC31xx Driver Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 01/19] ASoC: tlv320aic31xx: File header and copyright cleanup Andrew F. Davis
2017-11-30 12:29 ` Mark Brown
2017-11-29 21:32 ` [PATCH v2 02/19] ASoC: tlv320aic31xx: Change aic31xx_power_off return type to void Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 03/19] ASoC: tlv320aic31xx: Move ACPI table next to OF table Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 04/19] ASoC: tlv320aic31xx: General source formatting cleanup Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 05/19] ASoC: tlv320aic31xx: Fix GPIO1 register definition Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 06/19] ASoC: tlv320aic31xx: Reformat header file using GENMASK and BIT macros Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 07/19] ASoC: tlv320aic31xx: Merge init function into probe Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 08/19] ASoC: tlv320aic31xx: Switch GPIO handling to use gpiod_* API Andrew F. Davis
2017-12-04 16:47 ` Andrew F. Davis
2017-12-05 21:23 ` Andrew F. Davis [this message]
2017-12-06 12:46 ` Mark Brown
2017-11-29 21:32 ` [PATCH v2 09/19] ASoC: tlv320aic31xx: Remove platform data Andrew F. Davis
2017-12-01 13:26 ` Mark Brown
2017-12-05 21:20 ` Andrew F. Davis
2017-12-06 12:45 ` Mark Brown
2017-12-06 16:19 ` Andrew F. Davis
2017-12-06 17:30 ` Mark Brown
2017-12-06 17:48 ` Andrew F. Davis
2017-12-06 18:15 ` Mark Brown
2017-12-06 18:40 ` Andrew F. Davis
2017-12-06 19:11 ` Mark Brown
2017-12-06 19:15 ` Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 10/19] ASoC: tlv320aic31xx: Add MICBIAS off setting Andrew F. Davis
2017-12-01 13:30 ` Mark Brown
2017-12-01 14:56 ` Andrew F. Davis
2017-12-01 17:43 ` Mark Brown
2017-11-29 21:32 ` [PATCH v2 11/19] ASoC: tlv320aic31xx: Check clock and divider before division Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 12/19] ASoC: tlv320aic31xx: Add CODEC clock slave support Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 13/19] ASoC: tlv320aic31xx: Fix inverted BCLK handling Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 14/19] ASoC: tlv320aic31xx: Remove regulator notification handling Andrew F. Davis
2017-12-01 13:36 ` Mark Brown
2017-12-01 15:01 ` Andrew F. Davis
2017-12-01 15:55 ` Mark Brown
2017-11-29 21:32 ` [PATCH v2 15/19] ASoC: tlv320aic31xx: Reset registers during power up Andrew F. Davis
2017-12-01 13:37 ` Mark Brown
2017-12-01 15:04 ` Andrew F. Davis
2017-12-01 15:55 ` Mark Brown
2017-11-29 21:32 ` [PATCH v2 16/19] ASoC: tlv320aic31xx: Add short circuit detection support Andrew F. Davis
2017-12-01 13:39 ` Mark Brown
2017-12-01 15:32 ` Andrew F. Davis
2017-12-01 15:57 ` Mark Brown
2017-12-06 17:15 ` Andrew F. Davis
2017-12-06 20:22 ` Andrew F. Davis
2017-12-07 12:03 ` Mark Brown
2017-12-07 15:37 ` Andrew F. Davis
2017-12-07 17:23 ` Mark Brown
2017-11-29 21:32 ` [PATCH v2 17/19] ASoC: tlv320aic31xx: Add overflow " Andrew F. Davis
2017-11-29 21:32 ` [PATCH v2 18/19] ASoC: tlv320aic31xx: Add headphone/headset detection Andrew F. Davis
2017-12-01 13:41 ` Mark Brown
2017-12-06 17:25 ` Andrew F. Davis
2017-12-06 17:32 ` Mark Brown
2017-12-06 17:47 ` Andrew F. Davis
2017-12-06 17:52 ` Mark Brown
2017-11-29 21:33 ` [PATCH v2 19/19] ASoC: tlv320aic31xx: Add button press detection Andrew F. Davis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=17fcc926-9ee8-1229-ea3d-f38347cb9a23@ti.com \
--to=afd@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=bcousson@baylibre.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).