From patchwork Fri Jun 21 11:56:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pawe=C5=82_Chmiel?= X-Patchwork-Id: 11009889 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 F240D14E5 for ; Fri, 21 Jun 2019 11:56:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E2D17289A7 for ; Fri, 21 Jun 2019 11:56:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D71A828A18; Fri, 21 Jun 2019 11:56:19 +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=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 1FE7B289E8 for ; Fri, 21 Jun 2019 11:56:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726734AbfFUL4N (ORCPT ); Fri, 21 Jun 2019 07:56:13 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:33926 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726285AbfFUL4M (ORCPT ); Fri, 21 Jun 2019 07:56:12 -0400 Received: by mail-lf1-f65.google.com with SMTP id y198so4909413lfa.1; Fri, 21 Jun 2019 04:56:10 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=Y6CY0RheL+tKXKaf6H+vxXAMTeNTiZ763D8RhuvLAtc=; b=mog0CL2U0G1P8NJgVE/dtGaUCKtnqsbnRVgfihGI+R1N1xTZON4z3Vc/zEDa6RWwju ca+WqipdrsAuErOjZkSRMn6zMb2uLt/OajY8Q6CHcnAr2Jchn+iAEySCuH4olXqzUsIC M/oIIKLFtMcNxdYCriD1OG3R2wn5xIUU3L8y23a4VAaVZHsSKVrIaZBcMaVEQOKKBvof RO6PQ5TJNjxezCIxwxbOGt/zqJ3UTxOS5HHizU/AB4JHrjn8zjDTKRdVFtTkz5Xf+2V4 34T4/MOrzdhftqo4MlzFaXzkE0W6b77Y4esu+/WDee/ITqkbZuuY1ackyagPAi0kmyVm lHQA== 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:mime-version:content-transfer-encoding; bh=Y6CY0RheL+tKXKaf6H+vxXAMTeNTiZ763D8RhuvLAtc=; b=XxMZDhknaoRCSmE8846DGsOet8F0tC4Htxz8hlLz/v0haWrviuzQDydCNiO6EcGN9r VCo0Cse1TfoaHpLeb3e1GZyz+qRyPg++C3tMzkw8oi/euW86WTNfZqC7ybQLvB0y324f Ox+k7SzsxS7nhWcji2deCTand0bJTYaOnr04hVBdoUX/H+ZH7maGMexjRjNA2FTVb/QA Q5bjGPr+2dOUXpjyihs2jF2HuNOMPpH6Uf5Rm12IlA3uodzMgzoPVaZoYSarqeuoNQyX hU/4IRpbaDhySjWqoKM9Wj68bV2o0ZC2jVrUJk3e+uoKMCwxnUj3j+cd9znw8n2h1w0H 7SmA== X-Gm-Message-State: APjAAAU5tswl7YZ9/sI8Sg7qwNxO43APdOErBJ/1a1R1j5CPm2Lm1gIb Y138wmY1lIFW3T3k4/BhUV2o/OPt X-Google-Smtp-Source: APXvYqwqTasJcDIxaN0kCPAmlskTL45Kf7oqTESP7/BzjMEakfzchsEzCi4jMYZLcDVSLh2seJSBGw== X-Received: by 2002:a19:9e4b:: with SMTP id h72mr42918875lfe.21.1561118170186; Fri, 21 Jun 2019 04:56:10 -0700 (PDT) Received: from localhost.localdomain ([2a02:a315:5445:5300:a5e4:32fe:c6e4:d5eb]) by smtp.googlemail.com with ESMTPSA id s14sm356791ljd.88.2019.06.21.04.56.09 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 21 Jun 2019 04:56:09 -0700 (PDT) From: =?utf-8?q?Pawe=C5=82_Chmiel?= To: sre@kernel.org Cc: lee.jones@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, =?utf-8?q?Pa?= =?utf-8?q?we=C5=82_Chmiel?= Subject: [PATCH v4 1/2] power: supply: max8998-charger: Parse device tree for required data. Date: Fri, 21 Jun 2019 13:56:01 +0200 Message-Id: <20190621115602.17559-2-pawel.mikolaj.chmiel@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190621115602.17559-1-pawel.mikolaj.chmiel@gmail.com> References: <20190621115602.17559-1-pawel.mikolaj.chmiel@gmail.com> MIME-Version: 1.0 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 patch adds missing code for reading charger configuration from devicetree. Signed-off-by: Paweł Chmiel --- Changes from v3: - Property prefix should be maxim, not max8998 - Changed property name to more meaning full Changes from v2: - Make restart level and charge timeout properties optional. If they're not present in devicetree, assume they're disabled. Changes from v1: - Removed unneeded Fixes tag - Use new property names --- drivers/power/supply/max8998_charger.c | 60 ++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/drivers/power/supply/max8998_charger.c b/drivers/power/supply/max8998_charger.c index 9a926c7c0f22..dfd473ed4c5b 100644 --- a/drivers/power/supply/max8998_charger.c +++ b/drivers/power/supply/max8998_charger.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -69,6 +70,59 @@ static const struct power_supply_desc max8998_battery_desc = { .num_properties = ARRAY_SIZE(max8998_battery_props), }; +static int max8998_pmic_dt_parse_pdata(struct max8998_dev *iodev, + struct max8998_platform_data *pdata) +{ + struct device_node *pmic_np = iodev->dev->of_node; + struct device_node *charger_np; + int ret; + + charger_np = of_get_child_by_name(pmic_np, "charger"); + if (!charger_np) { + dev_err(iodev->dev, "could not find charger sub-node\n"); + return -EINVAL; + } + + ret = of_property_read_u32(charger_np, + "maxim,end-of-charge-percentage", + &pdata->eoc); + if (ret < 0) { + dev_err(iodev->dev, + "Could not find maxim,end-of-charge-percentage in devicetree\n"); + return ret; + } + + ret = of_property_read_u32(charger_np, + "maxim,charge-restart-threshold", + &pdata->restart); + if (ret < 0) { + if (ret != -EINVAL) { + dev_err(iodev->dev, + "Failed to read maxim,charge-restart-threshold\n"); + return ret; + } + + pdata->restart = -1; + dev_dbg(iodev->dev, "Charge Restart Threshold disabled\n"); + } + + ret = of_property_read_u32(charger_np, + "maxim,charge-timeout", + &pdata->timeout); + if (ret < 0) { + if (ret != -EINVAL) { + dev_err(iodev->dev, + "Failed to read maxim,charge-timeout\n"); + return ret; + } + + pdata->timeout = -1; + dev_dbg(iodev->dev, "Charge Full Timeout disabled\n"); + } + + return 0; +} + static int max8998_battery_probe(struct platform_device *pdev) { struct max8998_dev *iodev = dev_get_drvdata(pdev->dev.parent); @@ -83,6 +137,12 @@ static int max8998_battery_probe(struct platform_device *pdev) return -ENODEV; } + if (IS_ENABLED(CONFIG_OF) && iodev->dev->of_node) { + ret = max8998_pmic_dt_parse_pdata(iodev, pdata); + if (ret) + return ret; + } + max8998 = devm_kzalloc(&pdev->dev, sizeof(struct max8998_battery_data), GFP_KERNEL); if (!max8998) From patchwork Fri Jun 21 11:56:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pawe=C5=82_Chmiel?= X-Patchwork-Id: 11009893 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 B373C14E5 for ; Fri, 21 Jun 2019 11:56:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3623289A7 for ; Fri, 21 Jun 2019 11:56:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96FB128A18; Fri, 21 Jun 2019 11:56:23 +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=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 41BFD289A7 for ; Fri, 21 Jun 2019 11:56:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726785AbfFUL4S (ORCPT ); Fri, 21 Jun 2019 07:56:18 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:45789 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726229AbfFUL4N (ORCPT ); Fri, 21 Jun 2019 07:56:13 -0400 Received: by mail-lf1-f68.google.com with SMTP id u10so4848159lfm.12; Fri, 21 Jun 2019 04:56:12 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=pCsNSIhjCg2UmLajKiPXkdtHAurjo1ODjNh3/mWoClA=; b=t6XLQK+21pUtRXc7cF53j9Jq3VtzW+ROxWWda0+c7ksrFBHTdz8iD1jgNN1UucJgOR cy5F40eiIbhTg1StMkkocZlnVZyvdJDu8g9JiZjqKnRt2xDWB1Fx7W9bhhC1skRJoimc CRxR1ZjllvBKZPzowD1n2HwVprm2bmBk4xQN9fX5SLLZQ9Q6nUVcGWTHSdtrSZkpE5RU FKh1CO2EjUUek+3yQVs6Rw1KrDIAMYS15XhaTOHZt5zUGO/jhbZMYhXAZkusi4jpsHMt gKIAYbODe/HkOl9Qjg7xx050nVAwt8lF2xVfCec70ljVQe4kb3df5lNsOtsJOcbdFTpV uAag== 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:mime-version:content-transfer-encoding; bh=pCsNSIhjCg2UmLajKiPXkdtHAurjo1ODjNh3/mWoClA=; b=ai5Lfqwk6mqH4rsVecJHhOwuOcYwAx+RCvhKNjQ0yY0202a1ItIMDHHuJLZJhx2ksK qdUZmEQ3dVYoGU+nhBpb4/xcUmdngA8sWCergIxa61hQEuIDy7/2mZuI8EpkVotYPQQ1 qMuml11noKjCt8cx83qVq0nOiAzBM3GFRYDvdT7B/zU5N9roUO6TUEh3h0fGAIcwuCjI NefIjXKsgBS/xGvPlLSlVg7aU1erkYWEhECOUXkwINNbR7osjnm2v3ZScrw7k20zti06 5EizbdC+znldFH3WaL37V8FMurnLso+6Sx0crMDsIQ9FoLJGYzwhfjONX4QpCGp87kzo +Ndw== X-Gm-Message-State: APjAAAXSmHAg70kgOYIfIm6V4q4/62Q9cbACzJz6BHRVVoCMnuB71hmN jy4Fyi/re/JJf1ju0dGw/WQ= X-Google-Smtp-Source: APXvYqwm0zb8cKHdWTip+O/MfIH2WGl+lLZVyzk7rsIfknm+CFaWo6YdBbHwK8FAbWRlqBDECOKUow== X-Received: by 2002:ac2:54ae:: with SMTP id w14mr4069909lfk.124.1561118171386; Fri, 21 Jun 2019 04:56:11 -0700 (PDT) Received: from localhost.localdomain ([2a02:a315:5445:5300:a5e4:32fe:c6e4:d5eb]) by smtp.googlemail.com with ESMTPSA id s14sm356791ljd.88.2019.06.21.04.56.10 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 21 Jun 2019 04:56:10 -0700 (PDT) From: =?utf-8?q?Pawe=C5=82_Chmiel?= To: sre@kernel.org Cc: lee.jones@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, =?utf-8?q?Pa?= =?utf-8?q?we=C5=82_Chmiel?= Subject: [PATCH v4 2/2] dt-bindings: mfd: max8998: Add charger subnode binding Date: Fri, 21 Jun 2019 13:56:02 +0200 Message-Id: <20190621115602.17559-3-pawel.mikolaj.chmiel@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190621115602.17559-1-pawel.mikolaj.chmiel@gmail.com> References: <20190621115602.17559-1-pawel.mikolaj.chmiel@gmail.com> MIME-Version: 1.0 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 patch adds devicetree bindings documentation for battery charging controller as the subnode of MAX8998 PMIC. Signed-off-by: Paweł Chmiel --- Changes from v3: - Property prefix should be maxim, not max8998 - Describe what End of Charge in percent means Changes from v2: - Make charge-restart-level-microvolt optional. - Make charge-timeout-hours optional. Changes from v1: - Removed unneeded Fixes tag - Correct description of all charger values - Added missing property unit --- .../devicetree/bindings/mfd/max8998.txt | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/Documentation/devicetree/bindings/mfd/max8998.txt b/Documentation/devicetree/bindings/mfd/max8998.txt index 5f2f07c09c90..368f787d6079 100644 --- a/Documentation/devicetree/bindings/mfd/max8998.txt +++ b/Documentation/devicetree/bindings/mfd/max8998.txt @@ -48,6 +48,25 @@ Additional properties required if max8998,pmic-buck2-dvs-gpio is defined: - max8998,pmic-buck2-dvs-voltage: An array of 2 voltage values in microvolts for buck2 regulator that can be selected using dvs gpio. +Charger: Configuration for battery charging controller should be added +inside a child node named 'charger'. + Required properties: + - maxim,end-of-charge-percentage: End of Charge in percent. + When the charge current in constant-voltage phase drops below + end-of-charge-percentage of it's start value, charging is terminated. + If value equals 0, leave it unchanged. Otherwise it should be value + from 10 to 45 by 5 step. + + Optional properties: + - maxim,charge-restart-threshold: Charge restart threshold in millivolts. + If property is not present, this will be disabled. + Valid values are: 0, 100, 150, 200. If the value equals 0, leave it + unchanged. + + - maxim,charge-timeout: Charge timeout in hours. If property is not + present, this will be disabled. Valid values are: 0, 5, 6, 7. + If the value equals 0, leave it unchanged. + Regulators: All the regulators of MAX8998 to be instantiated shall be listed in a child node named 'regulators'. Each regulator is represented by a child node of the 'regulators' node. @@ -97,6 +116,13 @@ Example: max8998,pmic-buck2-dvs-gpio = <&gpx0 0 3 0 0>; /* SET3 */ max8998,pmic-buck2-dvs-voltage = <1350000>, <1300000>; + /* Charger configuration */ + charger { + maxim,end-of-charge-percentage = <20>; + maxim,charge-restart-threshold = <100>; + maxim,charge-timeout = <7>; + }; + /* Regulators to instantiate */ regulators { ldo2_reg: LDO2 {