From: Marek Belisko <marek.belisko@open-nandra.com>
To: sre@kernel.org
Cc: robh+dt@kernel.org, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org, hns@goldelico.com, pavel@ucw.cz,
Marek Belisko <marek.belisko@gmail.com>
Subject: [RFC PATCH 2/5] power: generic-adc-battery: Parse more properties from DT
Date: Tue, 1 Aug 2017 22:55:23 +0200 [thread overview]
Message-ID: <1501620926-22669-3-git-send-email-marek.belisko@open-nandra.com> (raw)
In-Reply-To: <1501620926-22669-1-git-send-email-marek.belisko@open-nandra.com>
From: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
---
drivers/power/supply/generic-adc-battery.c | 68 ++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/drivers/power/supply/generic-adc-battery.c b/drivers/power/supply/generic-adc-battery.c
index b5e9208..d4daa6a 100644
--- a/drivers/power/supply/generic-adc-battery.c
+++ b/drivers/power/supply/generic-adc-battery.c
@@ -23,6 +23,7 @@
#include <linux/iio/consumer.h>
#include <linux/iio/types.h>
#include <linux/power/generic-adc-battery.h>
+#include <linux/of_gpio.h>
#define JITTER_DEFAULT 10 /* hope 10ms is enough */
@@ -241,6 +242,69 @@ static irqreturn_t gab_charged(int irq, void *dev_id)
return IRQ_HANDLED;
}
+#ifdef CONFIG_OF
+static struct gab_platform_data *gab_dt_probe(struct platform_device *pdev)
+{
+ struct gab_platform_data *pdata;
+ struct device_node *np = pdev->dev.of_node;
+ const char *name;
+ u32 val;
+ int err;
+
+ pdata = devm_kzalloc(&pdev->dev,
+ sizeof(struct gab_platform_data),
+ GFP_KERNEL);
+ if (!pdata)
+ return ERR_PTR(-ENOMEM);
+
+ pdata->gpio_charge_finished = of_get_gpio(np, 0);
+
+ /* parse and fill power_supply_info struct */
+ err = of_property_read_u32(np, "technology", &val);
+ if (err) {
+ dev_info(&pdev->dev, "Battery technology unknown\n");
+ val = 0;
+ }
+ pdata->battery_info.technology = val;
+
+ err = of_property_read_string(np, "battery-name", &name);
+ if (err) {
+ dev_info(&pdev->dev, "Battery name empty, setting default\n");
+ }
+ pdata->battery_info.name = name;
+
+ val = 0;
+ err = of_property_read_u32(np, "charge_empty_design", &val);
+ pdata->battery_info.charge_empty_design = val;
+
+ val = 0;
+ err = of_property_read_u32(np, "charge_full_design", &val);
+ pdata->battery_info.charge_full_design = val;
+
+ val = 0;
+ err = of_property_read_u32(np, "voltage_min_design", &val);
+ pdata->battery_info.voltage_min_design = val;
+
+ val = 0;
+ err = of_property_read_u32(np, "voltage_max-design", &val);
+ pdata->battery_info.voltage_max_design = val;
+
+ return pdata;
+}
+
+static const struct of_device_id of_gab_match[] = {
+ { .compatible = "linux,generic-adc-battery", },
+ {},
+};
+MODULE_DEVICE_TABLE(of, of_gab_match);
+
+#else
+static struct gab_platform_data gab_dt_probe(struct platform_device *pdev)
+{
+ ERR_PTR(-ENODEV);
+}
+#endif
+
static int gab_probe(struct platform_device *pdev)
{
struct gab *adc_bat;
@@ -258,6 +322,9 @@ static int gab_probe(struct platform_device *pdev)
return -ENOMEM;
}
+ if (pdata == NULL)
+ pdata = gab_dt_probe(pdev);
+
psy_cfg.drv_data = adc_bat;
psy_desc = &adc_bat->psy_desc;
psy_desc->name = "generic-adc-batt";//pdata->battery_info.name;
@@ -418,6 +485,7 @@ static struct platform_driver gab_driver = {
.driver = {
.name = "generic-adc-battery",
.pm = &gab_pm_ops,
+ .of_match_table = of_gab_match,
},
.probe = gab_probe,
.remove = gab_remove,
--
2.7.4
next prev parent reply other threads:[~2017-08-01 20:55 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-01 20:55 [RFC PATCH 0/5] Add formula for LiIon batteries to compute capacity Marek Belisko
2017-08-01 20:55 ` [RFC PATCH 1/5] dt-bindings: power: Add battery types Marek Belisko
2017-08-02 11:38 ` Pavel Machek
2017-08-02 11:43 ` Pavel Machek
2017-08-02 11:47 ` Belisko Marek
2017-08-01 20:55 ` Marek Belisko [this message]
2017-08-02 11:56 ` [RFC PATCH 2/5] power: generic-adc-battery: Parse more properties from DT Pavel Machek
2017-08-02 11:57 ` Belisko Marek
2017-08-29 9:45 ` Sebastian Reichel
2017-08-01 20:55 ` [RFC PATCH 3/5] power/generic-adc-battery: Add support for temperature and add check for charge from iio current channel Marek Belisko
2017-08-29 9:54 ` Sebastian Reichel
2017-08-01 20:55 ` [RFC PATCH 4/5] power: Add formula for computing LiIon State of Charge from Voltage Marek Belisko
2017-08-01 20:55 ` [RFC PATCH 5/5] power: generic-adc-battery: Add capacity handling Marek Belisko
2017-08-29 10:11 ` Sebastian Reichel
2017-09-08 11:32 ` libbattery was " Pavel Machek
2017-09-08 13:15 ` H. Nikolaus Schaller
2017-10-18 12:28 ` Pavel Machek
2017-10-18 12:48 ` H. Nikolaus Schaller
2017-10-18 13:09 ` Pavel Machek
2017-10-18 13:22 ` Tony Lindgren
2017-10-18 13:56 ` Pavel Machek
2017-10-18 15:52 ` H. Nikolaus Schaller
2017-10-18 16:13 ` Pavel Machek
2017-10-18 16:48 ` H. Nikolaus Schaller
2017-10-18 15:47 ` H. Nikolaus Schaller
2017-10-19 16:24 ` Tony Lindgren
2017-10-19 16:55 ` H. Nikolaus Schaller
2017-10-19 17:06 ` Tony Lindgren
2017-10-19 17:20 ` H. Nikolaus Schaller
2017-10-19 17:33 ` Ladislav Michl
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=1501620926-22669-3-git-send-email-marek.belisko@open-nandra.com \
--to=marek.belisko@open-nandra.com \
--cc=hns@goldelico.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=marek.belisko@gmail.com \
--cc=pavel@ucw.cz \
--cc=robh+dt@kernel.org \
--cc=sre@kernel.org \
/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®