From patchwork Sat Jan 5 00:49:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 10749025 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 95CEB1575 for ; Sat, 5 Jan 2019 00:49:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 84D672879C for ; Sat, 5 Jan 2019 00:49:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 796EC287A5; Sat, 5 Jan 2019 00:49:49 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 28C6F2879C for ; Sat, 5 Jan 2019 00:49:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726328AbfAEAth (ORCPT ); Fri, 4 Jan 2019 19:49:37 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:39321 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725862AbfAEAtg (ORCPT ); Fri, 4 Jan 2019 19:49:36 -0500 Received: by mail-pg1-f193.google.com with SMTP id w6so18149632pgl.6; Fri, 04 Jan 2019 16:49:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Wop6KpWlwvxvZAv7XAUU5J2ClAasEuR4THaU6YiR25E=; b=k/D6A6tZWQxfzmM9RQBAEJ4C3b/S32PTn0oQLNpSmuo+1hFAe1hPSqqTyDd0/KPH7P fVOkeGxVYD6rL6n3nD7mYGzQZ5u1nalhir6OVhbqjY5h1uNzJqZWfWW99dbVuwzy4DR8 SpXRI2wQsCMOy78U2JNoz7413UBLOgYALm0pS7Ht/ilvxDtjKgPimgnf86kpZGPnAi06 /OtXT9C6LElYNYwDlkYbTx+pdte2ezN5cSM8nqG5f2mkSCO/ZxpRL1iz1ibw9yaPOx0y pNT7m6VAllC8JsvRInVUkwJbsLee3eymOsQsvDVG0BskMN+Yd9Nc3wpFrrolrpDVvS9A Ruxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Wop6KpWlwvxvZAv7XAUU5J2ClAasEuR4THaU6YiR25E=; b=jQNSyoQGtiUBPRmpAwxZjkaT6wFF68t0HsYAAj7k4rLV+c4AH2M+NXRnnkl6Gnr7K6 Rs8rUhwIJN6fSSzeEub98Y4zWH1scjgAhj2Pe2VLKr/ovNJhASR9TohEmUrizxUGOV/6 3Tj8eFm7DRXgZn7PH1Kt7on/MZ/VqP/Yd2ykUhiij3G/Q6DVNVIlbXD72m9zsf51bDNg jRfgfFcWCkf/eOnStyFdqUnm83UD2YEg6l+CqiMfpl506DJKtlEqKe/6l0j4HUcq7Q9z u665R/7nto6ZiAmkaB+tRo7GPw+mRqvMe4bfpCizAyyDFayJTYW6PqwxocWYDW5IonvG 41JQ== X-Gm-Message-State: AJcUukfLBv2uW+CZnVlhBS9F3Tu+h7482CD9IBrh0UrPnR0m90Fj5RQ4 IU1znJCFlFVhR4d8NJ4uGZY= X-Google-Smtp-Source: ALg8bN5lyM141jGQC8TUDMElJZmSrtVaCu9ZMtlDkas7wb5CoaXQ41Mkrjbf6bnJZ+EPvafQRlnHtg== X-Received: by 2002:a63:4002:: with SMTP id n2mr3379513pga.137.1546649375694; Fri, 04 Jan 2019 16:49:35 -0800 (PST) Received: from Asurada-Nvidia.nvidia.com (thunderhill.nvidia.com. [216.228.112.22]) by smtp.gmail.com with ESMTPSA id n68sm101525495pfb.62.2019.01.04.16.49.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Jan 2019 16:49:35 -0800 (PST) From: Nicolin Chen To: jdelvare@suse.com, linux@roeck-us.net, robh+dt@kernel.org, mark.rutland@arm.com Cc: linux-hwmon@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] dt-bindings: hwmon: ina3221: Add ti,single-shot property Date: Fri, 4 Jan 2019 16:49:03 -0800 Message-Id: <20190105004904.17947-2-nicoleotsuka@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190105004904.17947-1-nicoleotsuka@gmail.com> References: <20190105004904.17947-1-nicoleotsuka@gmail.com> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP By default, ina3221, as a hardware monitor, continuously measures the inputs and generates corresponding data. However, for battery powered devices, this mode might be power consuming. This patch adds a "ti,single-shot" property to allow changing the default continuous mode to single-shot operating mode. Signed-off-by: Nicolin Chen Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/hwmon/ina3221.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Documentation/devicetree/bindings/hwmon/ina3221.txt b/Documentation/devicetree/bindings/hwmon/ina3221.txt index a7b25caa2b8e..fa63b6171407 100644 --- a/Documentation/devicetree/bindings/hwmon/ina3221.txt +++ b/Documentation/devicetree/bindings/hwmon/ina3221.txt @@ -6,6 +6,16 @@ Texas Instruments INA3221 Device Tree Bindings - reg: I2C address Optional properties: + - ti,single-shot: This chip has two power modes: single-shot (chip takes one + measurement and then shuts itself down) and continuous ( + chip takes continuous measurements). The continuous mode is + more reliable and suitable for hardware monitor type device, + but the single-shot mode is more power-friendly and useful + for battery-powered device which cares power consumptions + while still needs some measurements occasionally. + If this property is present, the single-shot mode will be + used, instead of the default continuous one for monitoring. + = The node contains optional child nodes for three channels = = Each child node describes the information of input source = From patchwork Sat Jan 5 00:49:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 10749023 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 388F41575 for ; Sat, 5 Jan 2019 00:49:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 275122879C for ; Sat, 5 Jan 2019 00:49:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1BF3F287A5; Sat, 5 Jan 2019 00:49:43 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 9F46B2879C for ; Sat, 5 Jan 2019 00:49:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726389AbfAEAtj (ORCPT ); Fri, 4 Jan 2019 19:49:39 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:45401 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726313AbfAEAth (ORCPT ); Fri, 4 Jan 2019 19:49:37 -0500 Received: by mail-pg1-f195.google.com with SMTP id y4so18134520pgc.12; Fri, 04 Jan 2019 16:49:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XRyz/HR84h+9xFMDIsLC9tkNv9M+Rza3hD69+HSr11M=; b=M4MrvZ3sCvhCpDgU9LtuXO0lvgdBdZgQDj8fQ9WVWDAEdZbyQLORJ+ABC94FlpH2zZ w7fhoJvy/nICBfDRqX6/l+/3v+vMA2Q50+jrYf/xHpUH68LTB3pqOmiHAFB7coApD57e OGe5wYCtcmK0YmIEdsL9xxNQcBcdCOHk7hiFr93N3jST+VY9+zZfc6ysUqv+3qFxZV8p 4h1bvjzGHjrJkO36DbVg+Qq3dlha1J7+3Xy5er/rXu6ZQBikXw2vHy1M6RWAF7pnqL3J wGSF3OezQGcoloCpcb03qw6l87zUW2/Ec4NNK/BO9vB1XM4NWPAqkXXpJCk/23MOkn7J RXeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XRyz/HR84h+9xFMDIsLC9tkNv9M+Rza3hD69+HSr11M=; b=iNT5ZO2tTKNzZA0452Wm7GyWANyOBkSIKpfQMkofuHSDc6TwnnnSPgGB2tXkkWWgok kZ2iHXXfqKuC8ZvdbUTVoF+ASAeDF1bGISsURlbjEzrM+S160Rjkc8WfKySuWF/Bl5qp 6ZX5srlJRbTi9R2DvDOSCgfZjt55ZGtDFyHZBGfbz843h+EsaszBoBDO/9/V1YS9u9ub k2/K/YxWep7To2y4Ja2AZffDtTgWrEfKrq/baUzh6jM4BDNucoF5N+Vo7A7Lv+14Ix2b XghNVvw9NIFyOnmUlyovQKRa8Op1VZRNEfogmW5+esHQYx2BzV30RybBNXwUxnpGGLg7 KYUw== X-Gm-Message-State: AJcUukdudpjhY58qeAd459l+24MQmznK56KTtVPmmN4pS4AXNXDBWFAj m7pthqrr91R/Nuscts3M9Ev1Rgh6 X-Google-Smtp-Source: ALg8bN6NN4iqCTw5ka542Jfntd7uFuIoLJkFFCd7AUS4JsQYZg3XEUCxzeiILRikZLGqR/Rfouwk8Q== X-Received: by 2002:a63:d157:: with SMTP id c23mr22262583pgj.170.1546649376728; Fri, 04 Jan 2019 16:49:36 -0800 (PST) Received: from Asurada-Nvidia.nvidia.com (thunderhill.nvidia.com. [216.228.112.22]) by smtp.gmail.com with ESMTPSA id n68sm101525495pfb.62.2019.01.04.16.49.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Jan 2019 16:49:36 -0800 (PST) From: Nicolin Chen To: jdelvare@suse.com, linux@roeck-us.net, robh+dt@kernel.org, mark.rutland@arm.com Cc: linux-hwmon@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] hwmon: (ina3221) Implement ti,single-shot DT property Date: Fri, 4 Jan 2019 16:49:04 -0800 Message-Id: <20190105004904.17947-3-nicoleotsuka@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190105004904.17947-1-nicoleotsuka@gmail.com> References: <20190105004904.17947-1-nicoleotsuka@gmail.com> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP By default, ina3221, as a hardware monitor, continuously measures the inputs and generates corresponding data. However, for battery powered devices, this mode might be power consuming. The DT binding doc is updated with a new boolean type property to allow changing the default operating mode from consuming mode to single-shot mode, which will measure input on demand and then shut down to save power. So this patch implements the DT property accordingly. Signed-off-by: Nicolin Chen --- drivers/hwmon/ina3221.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c index e90ccac8bebb..152735659e19 100644 --- a/drivers/hwmon/ina3221.c +++ b/drivers/hwmon/ina3221.c @@ -91,6 +91,12 @@ enum ina3221_channels { INA3221_NUM_CHANNELS }; +enum ina3221_modes { + INA3221_MODE_SINGLE_SHOT, + INA3221_MODE_CONTINUOUS, + INA3221_NUM_MODES, +}; + /** * struct ina3221_input - channel input source specific information * @label: label of channel input source @@ -111,6 +117,7 @@ struct ina3221_input { * @inputs: Array of channel input source specific structures * @lock: mutex lock to serialize sysfs attribute accesses * @reg_config: Register value of INA3221_CONFIG + * @mode: Operating mode -- continuous or single-shot */ struct ina3221_data { struct device *pm_dev; @@ -119,6 +126,7 @@ struct ina3221_data { struct ina3221_input inputs[INA3221_NUM_CHANNELS]; struct mutex lock; u32 reg_config; + enum ina3221_modes mode; }; static inline bool ina3221_is_enabled(struct ina3221_data *ina, int channel) @@ -188,6 +196,11 @@ static int ina3221_read_in(struct device *dev, u32 attr, int channel, long *val) if (!ina3221_is_enabled(ina, channel)) return -ENODATA; + /* Write CONFIG register to trigger a single-shot measurement */ + if (ina->mode == INA3221_MODE_SINGLE_SHOT) + regmap_write(ina->regmap, INA3221_CONFIG, + ina->reg_config); + ret = ina3221_wait_for_data(ina); if (ret) return ret; @@ -232,6 +245,11 @@ static int ina3221_read_curr(struct device *dev, u32 attr, if (!ina3221_is_enabled(ina, channel)) return -ENODATA; + /* Write CONFIG register to trigger a single-shot measurement */ + if (ina->mode == INA3221_MODE_SINGLE_SHOT) + regmap_write(ina->regmap, INA3221_CONFIG, + ina->reg_config); + ret = ina3221_wait_for_data(ina); if (ret) return ret; @@ -617,6 +635,9 @@ static int ina3221_probe_from_dt(struct device *dev, struct ina3221_data *ina) if (!np) return 0; + if (of_property_read_bool(np, "ti,single-shot")) + ina->mode = INA3221_MODE_SINGLE_SHOT; + for_each_child_of_node(np, child) { ret = ina3221_probe_child_from_dt(dev, child, ina); if (ret) @@ -654,6 +675,9 @@ static int ina3221_probe(struct i2c_client *client, } } + /* Hardware default uses the continuous mode */ + ina->mode = INA3221_MODE_CONTINUOUS; + for (i = 0; i < INA3221_NUM_CHANNELS; i++) ina->inputs[i].shunt_resistor = INA3221_RSHUNT_DEFAULT; @@ -666,6 +690,10 @@ static int ina3221_probe(struct i2c_client *client, /* The driver will be reset, so use reset value */ ina->reg_config = INA3221_CONFIG_DEFAULT; + /* Clear continuous bit to use single-shot mode */ + if (ina->mode == INA3221_MODE_SINGLE_SHOT) + ina->reg_config &= ~INA3221_CONFIG_MODE_CONTINUOUS; + /* Disable channels if their inputs are disconnected */ for (i = 0; i < INA3221_NUM_CHANNELS; i++) { if (ina->inputs[i].disconnected)