From: Marek Belisko <marek@goldelico.com>
To: sre@kernel.org, dbaryshkov@gmail.com, dwmw2@infradead.org
Cc: mark.rutland@arm.com, tony@atomide.com,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-pm@vger.kernel.org, hns@goldelico.com,
gta04-owner@goldelico.com, Marek Belisko <marek@goldelico.com>
Subject: [PATCH v3 2/6] power: twl4030_madc_battery: Add device tree support
Date: Wed, 4 Feb 2015 23:14:31 +0100 [thread overview]
Message-ID: <1423088075-10025-3-git-send-email-marek@goldelico.com> (raw)
In-Reply-To: <1423088075-10025-1-git-send-email-marek@goldelico.com>
Signed-off-by: Marek Belisko <marek@goldelico.com>
---
drivers/power/twl4030_madc_battery.c | 81 ++++++++++++++++++++++++++++++++++++
1 file changed, 81 insertions(+)
diff --git a/drivers/power/twl4030_madc_battery.c b/drivers/power/twl4030_madc_battery.c
index 6af28b5..ec14bc6 100644
--- a/drivers/power/twl4030_madc_battery.c
+++ b/drivers/power/twl4030_madc_battery.c
@@ -20,6 +20,7 @@
#include <linux/i2c/twl4030-madc.h>
#include <linux/power/twl4030_madc_battery.h>
#include <linux/iio/consumer.h>
+#include <linux/of.h>
struct twl4030_madc_battery {
struct power_supply psy;
@@ -183,6 +184,82 @@ 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;
+ int ret;
+ int i, proplen;
+
+ 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-uah", &pdata->capacity);
+ if (ret != 0)
+ return ERR_PTR(-EINVAL);
+
+ /* parse and prepare charging data */
+ proplen = of_property_count_u32_elems(np, "volt-to-capacity-charging-map");
+ if (proplen < 0) {
+ dev_warn(&pdev->dev, "No 'volt-to-capacity-charging-map' property found\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ pdata->charging = devm_kzalloc(&pdev->dev,
+ sizeof(struct twl4030_madc_bat_calibration) * (proplen / 2),
+ GFP_KERNEL);
+
+ for (i = 0; i < proplen / 2; i++) {
+ of_property_read_u32_index(np, "volt-to-capacity-charging-map",
+ i * 2,
+ (u32 *)&pdata->charging[i].voltage);
+ of_property_read_u32_index(np, "volt-to-capacity-charging-map",
+ i * 2 + 1,
+ (u32 *)&pdata->charging[i].level);
+ }
+
+ /* parse and prepare discharging data */
+ proplen = of_property_count_u32_elems(np,
+ "volt-to-capacity-discharging-map");
+ if (proplen < 0) {
+ dev_warn(&pdev->dev, "No 'volt-to-capacity-discharging-map' property found\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ pdata->discharging = devm_kzalloc(&pdev->dev,
+ sizeof(struct twl4030_madc_bat_calibration) * (proplen / 2),
+ GFP_KERNEL);
+
+ for (i = 0; i < proplen / 2; i++) {
+ of_property_read_u32_index(np, "volt-to-capacity-discharging-map",
+ i * 2,
+ (u32 *)&pdata->discharging[i].voltage);
+ of_property_read_u32_index(np, "volt-to-capacity-discharging-map",
+ i * 2 + 1,
+ (u32 *)&pdata->discharging[i].level);
+ }
+
+ 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;
@@ -194,6 +271,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;
@@ -263,6 +343,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,
--
1.9.1
next prev parent reply other threads:[~2015-02-04 22:16 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-04 22:14 [PATCH v3 0/6] Convert twl4030_madc_battery to IIO consumer and add DT aupport Marek Belisko
2015-02-04 22:14 ` [PATCH v3 1/6] power: twl4030-madc-battery: Convert to iio consumer Marek Belisko
2015-02-04 22:14 ` Marek Belisko [this message]
2015-02-04 22:14 ` [PATCH v3 3/6] Documentation: DT: Document twl4030-madc-battery bindings Marek Belisko
2015-03-05 0:48 ` Sebastian Reichel
2015-03-16 21:05 ` Pavel Machek
2015-03-16 21:20 ` Belisko Marek
2015-03-16 21:37 ` Dr. H. Nikolaus Schaller
2015-03-17 8:48 ` Pavel Machek
2015-03-17 8:59 ` Dr. H. Nikolaus Schaller
2015-03-17 8:47 ` Pavel Machek
2015-03-17 8:56 ` Dr. H. Nikolaus Schaller
2015-03-17 10:37 ` Pavel Machek
2015-03-17 11:14 ` Dr. H. Nikolaus Schaller
2015-03-17 13:59 ` Pavel Machek
2015-03-17 14:12 ` Dr. H. Nikolaus Schaller
2015-03-17 9:07 ` Dr. H. Nikolaus Schaller
2015-03-17 10:01 ` Pavel Machek
2015-02-04 22:14 ` [PATCH v3 4/6] ARM: dts: omap3-gta04: Add battery support Marek Belisko
2015-03-05 0:37 ` Sebastian Reichel
2015-03-16 20:35 ` Tony Lindgren
2015-03-16 20:47 ` Belisko Marek
2015-03-16 20:50 ` Tony Lindgren
2015-02-04 22:14 ` [PATCH v3 5/6] power: twl4030_madc_battery: Add of_twl4030_madc_match to MODULE_DEVICE_TABLE Marek Belisko
2015-02-04 22:14 ` [PATCH v3 6/6] power: twl4030_madc_battery: Add missing MODULE_ALIAS Marek Belisko
2015-02-18 7:46 ` [PATCH v3 0/6] Convert twl4030_madc_battery to IIO consumer and add DT aupport Belisko Marek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1423088075-10025-3-git-send-email-marek@goldelico.com \
--to=marek@goldelico.com \
--cc=dbaryshkov@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=gta04-owner@goldelico.com \
--cc=hns@goldelico.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=sre@kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®