From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933977AbdK2RQC (ORCPT ); Wed, 29 Nov 2017 12:16:02 -0500 Received: from lelnx194.ext.ti.com ([198.47.27.80]:54761 "EHLO lelnx194.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933829AbdK2ROV (ORCPT ); Wed, 29 Nov 2017 12:14:21 -0500 From: "Andrew F. Davis" To: Liam Girdwood , Mark Brown , Rob Herring , Mark Rutland , =?UTF-8?q?Beno=C3=AEt=20Cousson?= , Tony Lindgren , Shawn Guo , Sascha Hauer CC: , , , "Andrew F . Davis" Subject: [PATCH v2 4/8] ASoC: tlv320aic3x: Fix the reset GPIO OF name Date: Wed, 29 Nov 2017 11:13:55 -0600 Message-ID: <20171129171359.29382-5-afd@ti.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171129171359.29382-1-afd@ti.com> References: <20171129171359.29382-1-afd@ti.com> MIME-Version: 1.0 Content-Type: text/plain X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The correct DT property for specifying a GPIO used for reset is "reset-gpios", fix this here. Fixes: c24fdc886fde ("ASoC: tlv320aic3x: Add device tree bindings") Signed-off-by: Andrew F. Davis --- sound/soc/codecs/tlv320aic3x.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 06f92571eba4..b751cad545da 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1804,11 +1804,18 @@ static int aic3x_i2c_probe(struct i2c_client *i2c, if (!ai3x_setup) return -ENOMEM; - ret = of_get_named_gpio(np, "gpio-reset", 0); - if (ret >= 0) + ret = of_get_named_gpio(np, "reset-gpios", 0); + if (ret >= 0) { aic3x->gpio_reset = ret; - else - aic3x->gpio_reset = -1; + } else { + ret = of_get_named_gpio(np, "gpio-reset", 0); + if (ret > 0) { + dev_warn(&i2c->dev, "Using deprecated property \"gpio-reset\", please update your DT"); + aic3x->gpio_reset = ret; + } else { + aic3x->gpio_reset = -1; + } + } if (of_property_read_u32_array(np, "ai3x-gpio-func", ai3x_setup->gpio_func, 2) >= 0) { -- 2.15.0