From patchwork Fri Feb 14 13:24:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Belisko X-Patchwork-Id: 320448 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6DFBB2C00A3 for ; Sat, 15 Feb 2014 00:24:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752416AbaBNNYa (ORCPT ); Fri, 14 Feb 2014 08:24:30 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:64179 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752210AbaBNNY3 (ORCPT ); Fri, 14 Feb 2014 08:24:29 -0500 Received: by mail-ee0-f46.google.com with SMTP id c13so5653666eek.19 for ; Fri, 14 Feb 2014 05:24:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=/LHEiDcknVmRKqnwKvfLO/gJz2c2BbZRCC99zDdr064=; b=H2WXCwoIhEI+a1okdzef2KRp+ziWP4ECHuAIAOF8dEv77yQWCZO8398nH7ocALE89Z TiBwJduqmTkJT5ajhDtu1dQkaoCF4H80ckE3q/QftKJDWXqlpdJLSMgqMElhNV7Kw5Vz cSJjmCKrmJwabfWuGWtPxRYfS/8Zh/WwcFidDR4XrraP4ZHPPyewg54SR9vIejJkQEbH 6Qkg8vY7Mzi9DszzvBA+cesfIv/McyuPKkeGYYsWUoTf/ut5peMZCyrktrXErXAMbZp1 PH7daawcu7CXojsOAxbu4C3GQ0Xgo8BByl6bOnrjBPZtlylfGytLW4drzim94ZrEbsHh 9u1g== X-Received: by 10.14.53.8 with SMTP id f8mr8928008eec.3.1392384267745; Fri, 14 Feb 2014 05:24:27 -0800 (PST) Received: from localhost.localdomain (ip-85.163.197.255.o2inet.sk. [85.163.197.255]) by mx.google.com with ESMTPSA id 46sm19767478ees.4.2014.02.14.05.24.23 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Feb 2014 05:24:26 -0800 (PST) From: Marek Belisko To: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, rob@landley.net, dbaryshkov@gmail.com, dwmw2@infradead.org, grant.likely@linaro.org Cc: devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, hns@goldelico.com, Marek Belisko Subject: [PATCH] power: twl4030_madc_battery: Add device tree support. Date: Fri, 14 Feb 2014 14:24:19 +0100 Message-Id: <1392384259-14311-1-git-send-email-marek@goldelico.com> X-Mailer: git-send-email 1.8.3.2 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Signed-off-by: Marek Belisko --- .../bindings/power_supply/twl4030_madc_battery.txt | 15 +++ drivers/power/twl4030_madc_battery.c | 109 +++++++++++++++++++++ 2 files changed, 124 insertions(+) create mode 100644 Documentation/devicetree/bindings/power_supply/twl4030_madc_battery.txt diff --git a/Documentation/devicetree/bindings/power_supply/twl4030_madc_battery.txt b/Documentation/devicetree/bindings/power_supply/twl4030_madc_battery.txt new file mode 100644 index 0000000..bebc876 --- /dev/null +++ b/Documentation/devicetree/bindings/power_supply/twl4030_madc_battery.txt @@ -0,0 +1,15 @@ +twl4030_madc_battery + +Required properties: + - compatible : "ti,twl4030-madc-battery" + - capacity : battery capacity in uAh + - charging-calibration-data : list of voltage(mV):level(%) values for charging calibration (see example) + - discharging-calibration-data : list of voltage(mV):level(%) values for discharging calibration (see example) + +Example: + madc-battery { + compatible = "ti,twl4030-madc-battery"; + capacity = <1200000>; + charging-calibration-data = <4200 100 4100 75 4000 55 3900 25 3800 5 3700 2 3600 1 3300 0>; + discharging-calibration-data = <4200 100 4100 95 4000 70 3800 50 3700 10 3600 5 3300 0>; + }; diff --git a/drivers/power/twl4030_madc_battery.c b/drivers/power/twl4030_madc_battery.c index 7ef445a..2843382 100644 --- a/drivers/power/twl4030_madc_battery.c +++ b/drivers/power/twl4030_madc_battery.c @@ -19,6 +19,7 @@ #include #include #include +#include struct twl4030_madc_battery { struct power_supply psy; @@ -188,6 +189,110 @@ static int twl4030_cmp(const void *a, const void *b) ((struct twl4030_madc_bat_calibration *)a)->voltage; } +#ifdef CONFIG_OF +static struct twl4030_madc_bat_platform_data * + twl4030_madc_dt_probe(struct platform_device *pdev) +{ + struct twl4030_madc_bat_platform_data *pdata; + struct device_node *np = pdev->dev.of_node; + struct property *prop; + int ret; + int sz, i, j = 0; + + pdata = devm_kzalloc(&pdev->dev, + sizeof(struct twl4030_madc_bat_platform_data), + GFP_KERNEL); + if (!pdata) + return ERR_PTR(-ENOMEM); + + ret = of_property_read_u32(np, "capacity", &pdata->capacity); + if (ret != 0) + return ERR_PTR(-EINVAL); + + /* parse and prepare charging data */ + prop = of_find_property(np, "charging-calibration-data", &sz); + if (!prop) + return ERR_PTR(-EINVAL); + + if (sz % 2) { + dev_warn(&pdev->dev, "Count of charging-calibration-data must be even!\n"); + return ERR_PTR(-EINVAL); + } + + sz /= sizeof(u32); + + { + u32 data[sz]; + + ret = of_property_read_u32_array(np, + "charging-calibration-data", &data[0], sz); + if (ret) + return ERR_PTR(ret); + + pdata->charging = devm_kzalloc(&pdev->dev, + sizeof(struct twl4030_madc_bat_calibration) * (sz / 2), + GFP_KERNEL); + + for (i = 0; i < sz; i += 2) { + pdata->charging[j].voltage = data[i]; + pdata->charging[j].level = data[i+1]; + j++; + } + + pdata->charging_size = sz / 2; + } + + /* parse and prepare discharging data */ + prop = of_find_property(np, "discharging-calibration-data", &sz); + if (!prop) + return ERR_PTR(-EINVAL); + + if (sz % 2) { + dev_warn(&pdev->dev, "Count of discharging-calibration-data must be even!\n"); + return ERR_PTR(-EINVAL); + } + + sz /= sizeof(u32); + + { + u32 data[sz]; + + ret = of_property_read_u32_array(np, + "discharging-calibration-data", &data[0], sz); + if (ret) + return ERR_PTR(ret); + + j = 0; + + pdata->discharging = devm_kzalloc(&pdev->dev, + sizeof(struct twl4030_madc_bat_calibration) * (sz / 2), + GFP_KERNEL); + + for (i = 0; i < sz; i += 2) { + pdata->discharging[j].voltage = data[i]; + pdata->discharging[j].level = data[i+1]; + j++; + } + + pdata->discharging_size = sz / 2; + } + + return pdata; +} + +static const struct of_device_id of_twl4030_madc_match[] = { + { .compatible = "ti,twl4030-madc-battery", }, + {}, +}; + +#else +static struct twl4030_madc_bat_platform_data * + twl4030_madc_dt_probe(struct platform_device *pdev) +{ + return ERR_PTR(-ENODEV); +} +#endif + static int twl4030_madc_battery_probe(struct platform_device *pdev) { struct twl4030_madc_battery *twl4030_madc_bat; @@ -197,6 +302,9 @@ static int twl4030_madc_battery_probe(struct platform_device *pdev) if (!twl4030_madc_bat) return -ENOMEM; + if (!pdata) + pdata = twl4030_madc_dt_probe(pdev); + twl4030_madc_bat->psy.name = "twl4030_battery"; twl4030_madc_bat->psy.type = POWER_SUPPLY_TYPE_BATTERY; twl4030_madc_bat->psy.properties = twl4030_madc_bat_props; @@ -234,6 +342,7 @@ static int twl4030_madc_battery_remove(struct platform_device *pdev) static struct platform_driver twl4030_madc_battery_driver = { .driver = { .name = "twl4030_madc_battery", + .of_match_table = of_match_ptr(of_twl4030_madc_match), }, .probe = twl4030_madc_battery_probe, .remove = twl4030_madc_battery_remove,