From: Daniel Mack <daniel@zonque.org>
To: zbr@ioremap.net, robh+dt@kernel.org, mark.rutland@arm.com,
szabolcs.gyurko@tlt.hu
Cc: sre@kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
robert.jarzmik@free.fr, Daniel Mack <daniel@zonque.org>
Subject: [PATCH v3 4/4] power: supply: ds2760_battery: add devicetree probing
Date: Wed, 4 Jul 2018 06:44:11 +0200 [thread overview]
Message-ID: <20180704044411.2693-5-daniel@zonque.org> (raw)
In-Reply-To: <20180704044411.2693-1-daniel@zonque.org>
Add a matching table for devicetree probing, and optionally set the module
parameter variables from DT properties.
Signed-off-by: Daniel Mack <daniel@zonque.org>
---
drivers/power/supply/ds2760_battery.c | 32 ++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/drivers/power/supply/ds2760_battery.c b/drivers/power/supply/ds2760_battery.c
index aa406a7c65a1..921cbcfd8c99 100644
--- a/drivers/power/supply/ds2760_battery.c
+++ b/drivers/power/supply/ds2760_battery.c
@@ -29,6 +29,7 @@
#include <linux/power_supply.h>
#include <linux/suspend.h>
#include <linux/w1.h>
+#include <linux/of.h>
static unsigned int cache_time = 1000;
module_param(cache_time, uint, 0644);
@@ -705,6 +706,27 @@ static int w1_ds2760_add_slave(struct w1_slave *sl)
psy_cfg.drv_data = di;
+ if (dev->of_node) {
+ u32 tmp;
+
+ psy_cfg.of_node = dev->of_node;
+
+ if (!of_property_read_bool(dev->of_node, "maxim,pmod-enabled"))
+ pmod_enabled = true;
+
+ if (!of_property_read_u32(dev->of_node,
+ "maxim,cache-time", &tmp))
+ cache_time = tmp;
+
+ if (!of_property_read_u32(dev->of_node,
+ "maxim,rated-capacity", &tmp))
+ rated_capacity = tmp / 10; /* property is in mAh */
+
+ if (!of_property_read_u32(dev->of_node,
+ "maxim,current-accumulator", &tmp))
+ current_accum = tmp;
+ }
+
di->charge_status = POWER_SUPPLY_STATUS_UNKNOWN;
sl->family_data = di;
@@ -719,7 +741,7 @@ static int w1_ds2760_add_slave(struct w1_slave *sl)
ds2760_battery_write_status(di, status);
- /* set rated capacity from module param */
+ /* set rated capacity from module param or device tree */
if (rated_capacity)
ds2760_battery_write_rated_capacity(di, rated_capacity);
@@ -769,6 +791,13 @@ static void w1_ds2760_remove_slave(struct w1_slave *sl)
power_supply_unregister(di->bat);
}
+#ifdef CONFIG_OF
+static const struct of_device_id w1_ds2760_of_ids[] = {
+ { .compatible = "maxim,ds2760" },
+ {}
+};
+#endif
+
static struct w1_family_ops w1_ds2760_fops = {
.add_slave = w1_ds2760_add_slave,
.remove_slave = w1_ds2760_remove_slave,
@@ -778,6 +807,7 @@ static struct w1_family_ops w1_ds2760_fops = {
static struct w1_family w1_ds2760_family = {
.fid = W1_FAMILY_DS2760,
.fops = &w1_ds2760_fops,
+ .of_match_table = of_match_ptr(w1_ds2760_of_ids),
};
module_w1_family(w1_ds2760_family);
--
2.17.1
next prev parent reply other threads:[~2018-07-04 4:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-04 4:44 [PATCH v3 0/4] Add devicetree functionality to w1 busses and ds2760 Daniel Mack
2018-07-04 4:44 ` [PATCH v3 1/4] dt-bindings: w1: document generic onewire and DS2760 bindings Daniel Mack
2018-07-05 23:32 ` Rob Herring
2018-07-06 5:30 ` Daniel Mack
2018-07-04 4:44 ` [PATCH v3 2/4] w1: core: match sub-nodes of bus masters in devicetree Daniel Mack
2018-07-04 4:44 ` [PATCH v3 3/4] power: supply: ds2760_battery: merge ds2760 supply driver with its w1 slave companion Daniel Mack
2018-07-04 4:44 ` Daniel Mack [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-06-29 17:31 [PATCH v3 0/4] Add devicetree functionality to w1 busses and ds2760 Daniel Mack
2018-06-29 17:31 ` [PATCH v3 4/4] power: supply: ds2760_battery: add devicetree probing Daniel Mack
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=20180704044411.2693-5-daniel@zonque.org \
--to=daniel@zonque.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robert.jarzmik@free.fr \
--cc=robh+dt@kernel.org \
--cc=sre@kernel.org \
--cc=szabolcs.gyurko@tlt.hu \
--cc=zbr@ioremap.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.