From patchwork Mon Aug 29 18:15:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowski X-Patchwork-Id: 9304301 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 07235601C0 for ; Mon, 29 Aug 2016 18:15:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F165C28935 for ; Mon, 29 Aug 2016 18:15:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E628F28957; Mon, 29 Aug 2016 18:15:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90FF728935 for ; Mon, 29 Aug 2016 18:15:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753429AbcH2SPP (ORCPT ); Mon, 29 Aug 2016 14:15:15 -0400 Received: from gagarine.paulk.fr ([109.190.93.129]:65198 "EHLO gagarine.paulk.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751983AbcH2SPP (ORCPT ); Mon, 29 Aug 2016 14:15:15 -0400 Received: by gagarine.paulk.fr (Postfix, from userid 65534) id D82A41FEA4; Mon, 29 Aug 2016 20:15:12 +0200 (CEST) Received: from localhost.localdomain (collins [192.168.1.129]) by gagarine.paulk.fr (Postfix) with ESMTP id 9934A1FE75; Mon, 29 Aug 2016 20:15:08 +0200 (CEST) From: Paul Kocialkowski To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, linux-tegra@vger.kernel.org, Dmitry Eremin-Solenikov , David Woodhouse , Sebastian Reichel , Paul Kocialkowski Subject: [PATCH v2] power: bq24735-charger: Request status GPIO with initial input setup Date: Mon, 29 Aug 2016 20:15:03 +0200 Message-Id: <20160829181503.9590-1-contact@paulk.fr> X-Mailer: git-send-email 2.9.3 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This requests the status GPIO with initial input setup. it is required to read the GPIO status at probe time and thus correctly avoid sending i2c messages when AC is not plugged. When requesting the GPIO without initial input setup, it always reads 0 which causes probe to fail as it assumes the charger is connected, sends i2c messages and fails. While at it, this switches the driver over to devm and gpio consumer. Signed-off-by: Paul Kocialkowski --- drivers/power/bq24735-charger.c | 29 +++++++---------------------- include/linux/power/bq24735-charger.h | 3 +-- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/drivers/power/bq24735-charger.c b/drivers/power/bq24735-charger.c index dc460bb..5744a88 100644 --- a/drivers/power/bq24735-charger.c +++ b/drivers/power/bq24735-charger.c @@ -25,7 +25,8 @@ #include #include #include -#include +#include +#include #include #include @@ -181,8 +182,8 @@ static bool bq24735_charger_is_present(struct bq24735 *charger) int ret; if (pdata->status_gpio_valid) { - ret = gpio_get_value_cansleep(pdata->status_gpio); - return ret ^= pdata->status_gpio_active_low == 0; + ret = gpiod_get_value_cansleep(pdata->status_gpio); + return ret ^= gpiod_is_active_low(pdata->status_gpio) == 0; } else { int ac = 0; @@ -308,7 +309,6 @@ static struct bq24735_platform *bq24735_parse_dt_data(struct i2c_client *client) struct device_node *np = client->dev.of_node; u32 val; int ret; - enum of_gpio_flags flags; pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) { @@ -317,11 +317,9 @@ static struct bq24735_platform *bq24735_parse_dt_data(struct i2c_client *client) return NULL; } - pdata->status_gpio = of_get_named_gpio_flags(np, "ti,ac-detect-gpios", - 0, &flags); - - if (flags & OF_GPIO_ACTIVE_LOW) - pdata->status_gpio_active_low = 1; + pdata->status_gpio = devm_gpiod_get(&client->dev, "ti,ac-detect", + GPIOD_IN); + pdata->status_gpio_valid = !IS_ERR(pdata->status_gpio); ret = of_property_read_u32(np, "ti,charge-current", &val); if (!ret) @@ -396,19 +394,6 @@ static int bq24735_charger_probe(struct i2c_client *client, i2c_set_clientdata(client, charger); - if (gpio_is_valid(charger->pdata->status_gpio)) { - ret = devm_gpio_request(&client->dev, - charger->pdata->status_gpio, - name); - if (ret) { - dev_err(&client->dev, - "Failed GPIO request for GPIO %d: %d\n", - charger->pdata->status_gpio, ret); - } - - charger->pdata->status_gpio_valid = !ret; - } - if (!charger->pdata->status_gpio_valid || bq24735_charger_is_present(charger)) { ret = bq24735_read_word(client, BQ24735_MANUFACTURER_ID); diff --git a/include/linux/power/bq24735-charger.h b/include/linux/power/bq24735-charger.h index 6b750c1a..bbc284e 100644 --- a/include/linux/power/bq24735-charger.h +++ b/include/linux/power/bq24735-charger.h @@ -28,8 +28,7 @@ struct bq24735_platform { const char *name; - int status_gpio; - int status_gpio_active_low; + struct gpio_desc *status_gpio; bool status_gpio_valid; bool ext_control;