From patchwork Sat Jul 14 12:26:52 2018 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: 10524703 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 23D3060245 for ; Sat, 14 Jul 2018 12:27:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11E1A28E8D for ; Sat, 14 Jul 2018 12:27:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 025AE28E94; Sat, 14 Jul 2018 12:27:18 +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 A55DD28E8D for ; Sat, 14 Jul 2018 12:27:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726129AbeGNMqA (ORCPT ); Sat, 14 Jul 2018 08:46:00 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:46789 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726043AbeGNMqA (ORCPT ); Sat, 14 Jul 2018 08:46:00 -0400 Received: by mail-lj1-f194.google.com with SMTP id 203-v6so15335922ljj.13; Sat, 14 Jul 2018 05:27:02 -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=ExUOh3qKcQ2/enZFtHv/uZk6QiNXGVDkKJxI7sOi3TI=; b=ZNB0wlmBmtvwQ8tWMbVqHotDFMwVyArDyzgGEcImqzqdLitKHp02gjCtKzUjvy57NG bO8A8+Pn9xoGYzZ7P5QtVsfsoBJ5YRL9GIcmiGvyrNNy5ymnthlvzxhq7vYwkAHOIGlz KCHlMaS6gf7Oc71OGyoytU4xXcIPrq32TbStLC8qx80ma3vB3LX7l/YgoCA4TsNHTzll 0uUXdzNKoids1sEgxOPEUBFAhks+UK+GN7rETsdpGuaMguVTa83qOiSzP2mEyhK3gWzQ XWwsibMaVtUdrYQ2QL+Nioo62OldSllVZ4kuMocQlwkAP/EI0spim0U8fGV5hMRexaNG kZ8w== 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=ExUOh3qKcQ2/enZFtHv/uZk6QiNXGVDkKJxI7sOi3TI=; b=eKgSRycUVbMY9d+yUjlEXwWBodut+Xajj9s7zjwQ6EjMXsEo0k8sEOV+XOuN+UtoxI YFv2tp/PvyWbppUaq0CtHeeV8UkDmeE6AeQDzClRo0cibr/PYzO+RP+yh8+htzMYVHnn yDB0tSHSwLuKN1ifjbqMBVylRWjjEO6YJI4PA1ebbLnc54CgrBvRwd/3/ZrmvuYumRj8 2QxmAq+QzKbhDBmDUBq/qR9rCHBjpUgO3sV1ywdnR2jbpA9rWmoZiZi2EDlzyNPORnKo FYjKpExwnOG9pdp/N8mNF7zR/0jLZGRWu1ywGn6xBhC0XUzzidrXK4S4lObDaRgshREJ Ae6w== X-Gm-Message-State: AOUpUlG4EM13+SX9or0QrHS+5H9ifHjTR+w1X6qbG+x4HVwksY8pThT/ QVtdtb0I+K2rkwfJuE59Lfs= X-Google-Smtp-Source: AAOMgpd4RF2PptNUX6a8yJPaOltsQPKuCMCSVe+Q7laZPsl/knzPpJNO86yFXHEX51ZDzSWqtt5bgA== X-Received: by 2002:a2e:380d:: with SMTP id f13-v6mr5487652lja.74.1531571222121; Sat, 14 Jul 2018 05:27:02 -0700 (PDT) Received: from localhost.localdomain (user-94-254-174-73.play-internet.pl. [94.254.174.73]) by smtp.googlemail.com with ESMTPSA id l3-v6sm5860732lfi.36.2018.07.14.05.27.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 14 Jul 2018 05:27:01 -0700 (PDT) From: =?UTF-8?q?Pawe=C5=82=20Chmiel?= To: lgirdwood@gmail.com, broonie@kernel.org, sre@kernel.org, lee.jones@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, =?UTF-8?q?Pawe=C5=82=20Chmiel?= Subject: [PATCH v2 2/3] power: supply: max8998-charger: Parse device tree for required data. Date: Sat, 14 Jul 2018 14:26:52 +0200 Message-Id: <1531571213-30593-3-git-send-email-pawel.mikolaj.chmiel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531571213-30593-1-git-send-email-pawel.mikolaj.chmiel@gmail.com> References: <1531571213-30593-1-git-send-email-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 v1: - Removed unneeded Fixes tag - Use new property names --- drivers/power/supply/max8998_charger.c | 50 ++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/drivers/power/supply/max8998_charger.c b/drivers/power/supply/max8998_charger.c index 66438029bdd0..0a03d3e05c3b 100644 --- a/drivers/power/supply/max8998_charger.c +++ b/drivers/power/supply/max8998_charger.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -82,6 +83,49 @@ 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, + "max8998,charge-eoc-percent", + &pdata->eoc); + if (ret < 0) { + dev_err(iodev->dev, + "Could not find max8998,charge-eoc-percent in devicetree\n"); + return ret; + } + + ret = of_property_read_u32(charger_np, + "max8998,charge-restart-level-microvolt", + &pdata->restart); + if (ret < 0) { + dev_err(iodev->dev, + "Could not find max8998,charge-restart-level-microvolt in devicetree\n"); + return ret; + } + + ret = of_property_read_u32(charger_np, + "max8998,charge-timeout-hours", + &pdata->timeout); + if (ret < 0) { + dev_err(iodev->dev, + "Could not find max8998,charge-timeout-hours in devicetree\n"); + return ret; + } + + return 0; +} + static int max8998_battery_probe(struct platform_device *pdev) { struct max8998_dev *iodev = dev_get_drvdata(pdev->dev.parent); @@ -96,6 +140,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)