From patchwork Sat Apr 1 20:25:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liam Breck X-Patchwork-Id: 9658283 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 1103760353 for ; Sat, 1 Apr 2017 20:25:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 025D62845E for ; Sat, 1 Apr 2017 20:25:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB6882852B; Sat, 1 Apr 2017 20:25:39 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham 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 7177C2845E for ; Sat, 1 Apr 2017 20:25:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751934AbdDAUZi (ORCPT ); Sat, 1 Apr 2017 16:25:38 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:33841 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751882AbdDAUZh (ORCPT ); Sat, 1 Apr 2017 16:25:37 -0400 Received: by mail-pg0-f67.google.com with SMTP id o123so22955865pga.1 for ; Sat, 01 Apr 2017 13:25:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=1YS4V76K0Kb5f9JiuP2amJjXgPIPw/w7/x9KfIVwS6g=; b=BAKx8lu5Q1hKILYpAgXfLn0VfFPqjunU28aENYtvntKvhE5UscS1F9QZInSHzHTZr3 yBaJhDZ4C5H3MAW0KWm+YqybrYwUM6ui6AcPuAuz3OQeSGOBub4QOmmplgRuK0A2wO/3 e8D2f1Dx9Rdv9Y2jPUziOodEJ2t/no3i7lX2AZLPkz3jUf0OMES0lXGJohmV4gty19NA dbTvjHzUH1jWZMeVN04YxCHsovWQIthfNWvzwWXkr1Z0Pof6MO+tl3VMSIVlSLNZ7duQ jKphJ97AzArQn11YICSlcfl5YWP+AjXvb8qK1Ae8og6Go3nHoEAcCmUKxtEDJDFgLA5K jYzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=1YS4V76K0Kb5f9JiuP2amJjXgPIPw/w7/x9KfIVwS6g=; b=QgMEy24VVsHYPn982qUiQMSPNmMQHEEnMgU/eMGKQvCwm9nHQKxQJjbrbGgO6iZCVA pvaQpi4xfWYpJE60q8Y9lwm776RyBOlNVp9WQjYovrqOdUF3LnPaYJmPpCb8Bunaqs/L FGGs4W3oBG7T1Lv5KCrc4dSNVecfetd9ktuazzVmhwzq+lcM3NqYwc9evucxkTvnSIp+ e+TqxoibgP8Yqszz3eLVoNS6lE98LBeSRIFBb6S1rRwv9c3mZo57dJwlkUfGKZ8/rBxv ldNKqKxZrui8tJkiNj4rnDklncxRbvJOejMUFD+58EwtycWackhj/9Ra5aVLm3d636l3 lekg== X-Gm-Message-State: AFeK/H0ulhxE1jEBhXRuBJKlm1bgv8NQHfGByZiA+WqX09uMHOfJC2v04bVRlc0fnlgrjg== X-Received: by 10.84.237.22 with SMTP id s22mr11378265plk.145.1491078337158; Sat, 01 Apr 2017 13:25:37 -0700 (PDT) Received: from localhost.localdomain (c-73-223-93-234.hsd1.ca.comcast.net. [73.223.93.234]) by smtp.gmail.com with ESMTPSA id m20sm17575831pgd.32.2017.04.01.13.25.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Apr 2017 13:25:36 -0700 (PDT) From: Liam Breck To: Sebastian Reichel , linux-pm@vger.kernel.org Cc: Tony Lindgren , Hans de Goede , Liam Breck Subject: [PATCH v3 2/4] power: bq24190_charger: Clean up extcon code Date: Sat, 1 Apr 2017 13:25:17 -0700 Message-Id: <20170401202519.16280-3-liam@networkimprov.net> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170401202519.16280-1-liam@networkimprov.net> References: <20170401202519.16280-1-liam@networkimprov.net> 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 From: Liam Breck Polishing and fixes for initial extcon patch. Fixes: 4db249b6f3b4 ("power: supply: bq24190_charger: Use extcon to determine ilimit, 5v boost") Cc: Tony Lindgren Cc: Hans de Goede Signed-off-by: Liam Breck --- drivers/power/supply/bq24190_charger.c | 75 ++++++++++++++++------------------ 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c index 64a48b9..ae27cdc 100644 --- a/drivers/power/supply/bq24190_charger.c +++ b/drivers/power/supply/bq24190_charger.c @@ -38,12 +38,13 @@ #define BQ24190_REG_POC_WDT_RESET_SHIFT 6 #define BQ24190_REG_POC_CHG_CONFIG_MASK (BIT(5) | BIT(4)) #define BQ24190_REG_POC_CHG_CONFIG_SHIFT 4 -#define BQ24190_REG_POC_CHG_CONFIG_CHARGE 1 -#define BQ24190_REG_POC_CHG_CONFIG_OTG 2 #define BQ24190_REG_POC_SYS_MIN_MASK (BIT(3) | BIT(2) | BIT(1)) #define BQ24190_REG_POC_SYS_MIN_SHIFT 1 #define BQ24190_REG_POC_BOOST_LIM_MASK BIT(0) #define BQ24190_REG_POC_BOOST_LIM_SHIFT 0 +#define BQ24190_REG_POC_CHG_CONFIG_DISABLE 0 +#define BQ24190_REG_POC_CHG_CONFIG_CHARGE 1 +#define BQ24190_REG_POC_CHG_CONFIG_OTG 2 #define BQ24190_REG_CCC 0x02 /* Charge Current Control */ #define BQ24190_REG_CCC_ICHG_MASK (BIT(7) | BIT(6) | BIT(5) | \ @@ -173,8 +174,9 @@ struct bq24190_dev_info { */ /* REG00[2:0] (IINLIM) in uAh */ -static const int bq24190_iinlim_values[] = { - 100000, 150000, 500000, 900000, 1200000, 1500000, 2000000, 3000000 }; +static const int bq24190_isc_iinlim_values[] = { + 100000, 150000, 500000, 900000, 1200000, 1500000, 2000000, 3000000 +}; /* REG02[7:2] (ICHG) in uAh */ static const int bq24190_ccc_ichg_values[] = { @@ -1298,16 +1300,17 @@ static void bq24190_extcon_work(struct work_struct *work) { struct bq24190_dev_info *bdi = container_of(work, struct bq24190_dev_info, extcon_work.work); - int ret, iinlim = 0; + int error, iinlim = 0; - ret = pm_runtime_get_sync(bdi->dev); - if (ret < 0) { - dev_err(bdi->dev, "Error getting runtime-pm ref: %d\n", ret); + error = pm_runtime_get_sync(bdi->dev); + if (error < 0) { + dev_warn(bdi->dev, "pm_runtime_get failed: %i\n", error); + pm_runtime_put_noidle(bdi->dev); return; } - if (extcon_get_state(bdi->extcon, EXTCON_CHG_USB_SDP) == 1) - iinlim = 500000; + if (extcon_get_state(bdi->extcon, EXTCON_CHG_USB_SDP) == 1) + iinlim = 500000; else if (extcon_get_state(bdi->extcon, EXTCON_CHG_USB_CDP) == 1 || extcon_get_state(bdi->extcon, EXTCON_CHG_USB_ACA) == 1) iinlim = 1500000; @@ -1315,33 +1318,25 @@ static void bq24190_extcon_work(struct work_struct *work) iinlim = 2000000; if (iinlim) { - ret = bq24190_set_field_val(bdi, BQ24190_REG_ISC, - BQ24190_REG_ISC_IINLIM_MASK, - BQ24190_REG_ISC_IINLIM_SHIFT, - bq24190_iinlim_values, - ARRAY_SIZE(bq24190_iinlim_values), - iinlim); - if (ret) - dev_err(bdi->dev, "Can't set IINLIM: %d\n", ret); + error = bq24190_set_field_val(bdi, BQ24190_REG_ISC, + BQ24190_REG_ISC_IINLIM_MASK, + BQ24190_REG_ISC_IINLIM_SHIFT, + bq24190_isc_iinlim_values, + ARRAY_SIZE(bq24190_isc_iinlim_values), + iinlim); + if (error < 0) + dev_err(bdi->dev, "Can't set IINLIM: %d\n", error); } - /* - * If no charger has been detected and host mode is requested, activate - * the 5V boost converter, otherwise deactivate it. - */ - if (!iinlim && extcon_get_state(bdi->extcon, EXTCON_USB_HOST) == 1) { - ret = bq24190_write_mask(bdi, BQ24190_REG_POC, - BQ24190_REG_POC_CHG_CONFIG_MASK, - BQ24190_REG_POC_CHG_CONFIG_SHIFT, - BQ24190_REG_POC_CHG_CONFIG_OTG); - } else { - ret = bq24190_write_mask(bdi, BQ24190_REG_POC, - BQ24190_REG_POC_CHG_CONFIG_MASK, - BQ24190_REG_POC_CHG_CONFIG_SHIFT, - BQ24190_REG_POC_CHG_CONFIG_CHARGE); - } - if (ret) - dev_err(bdi->dev, "Can't set CHG_CONFIG: %d\n", ret); + /* Set OTG 5V boost: on if no charger detected and in USB host mode, else off */ + error = bq24190_write_mask(bdi, BQ24190_REG_POC, + BQ24190_REG_POC_CHG_CONFIG_MASK, + BQ24190_REG_POC_CHG_CONFIG_SHIFT, + !iinlim && extcon_get_state(bdi->extcon, EXTCON_USB_HOST) == 1 + ? BQ24190_REG_POC_CHG_CONFIG_OTG + : BQ24190_REG_POC_CHG_CONFIG_CHARGE); + if (error < 0) + dev_err(bdi->dev, "Can't set CHG_CONFIG: %d\n", error); pm_runtime_mark_last_busy(bdi->dev); pm_runtime_put_autosuspend(bdi->dev); @@ -1432,10 +1427,10 @@ static int bq24190_probe(struct i2c_client *client, } /* - * The extcon-name property is purely an in kernel interface for - * x86/ACPI use, DT platforms should get extcon via phandle. + * ACPI platforms should use device_property "extcon-name". + * Devicetree platforms should get extcon via phandle (not yet supported). */ - if (device_property_read_string(dev, "extcon-name", &name) == 0) { + if (!device_property_read_string(dev, "extcon-name", &name)) { bdi->extcon = extcon_get_extcon_dev(name); if (!bdi->extcon) return -EPROBE_DEFER; @@ -1498,8 +1493,10 @@ static int bq24190_probe(struct i2c_client *client, bdi->extcon_nb.notifier_call = bq24190_extcon_event; ret = devm_extcon_register_notifier(dev, bdi->extcon, -1, &bdi->extcon_nb); - if (ret) + if (ret) { + dev_err(dev, "Can't register extcon\n"); goto out5; + } /* Sync initial cable state */ queue_delayed_work(system_wq, &bdi->extcon_work, 0);