diff options
| author |   Milo Kim <milo.kim@ti.com> | 2015-08-25 15:07:08 +0900 |
|---|---|---|
| committer |   Sebastian Reichel <sre@kernel.org> | 2015-09-22 13:35:29 +0200 |
| commit | 9615a29932e8a2c719142ac81481ad7d0e271924 (patch) | |
| tree | cca9519b65f1eb56660b1f9158e9272ee751f2e0 /drivers/power | |
| parent | power:lp8727_charger: use the private data instead of updating I2C device platform data (diff) | |
| download | linux-dev-9615a29932e8a2c719142ac81481ad7d0e271924.tar.xz linux-dev-9615a29932e8a2c719142ac81481ad7d0e271924.zip | |
power:lp8727_charger: parsing child node after getting debounce-ms
According to lp8727 bindings[*], charging parameter is optional.
So parsing can be skipped in case those properties are undefined.
However, 'debounce-ms' should be read prior to checking the properties.
Otherwise, 'debounce-ms' property will be ignored even it is configured
inside the DT.
So, counting child is processed after updating 'debounce-ms'.
[*] Documentation/devicetree/bindings/power_supply/lp8727_charger.txt
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Milo Kim <milo.kim@ti.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/lp8727_charger.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c index 30dc265435ee..042fb3dacb46 100644 --- a/drivers/power/lp8727_charger.c +++ b/drivers/power/lp8727_charger.c @@ -515,16 +515,16 @@ static struct lp8727_platform_data *lp8727_parse_dt(struct device *dev) struct lp8727_platform_data *pdata; const char *type; - /* If charging parameter is not defined, just skip parsing the dt */ - if (of_get_child_count(np) == 0) - return NULL; - pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) return ERR_PTR(-ENOMEM); of_property_read_u32(np, "debounce-ms", &pdata->debounce_msec); + /* If charging parameter is not defined, just skip parsing the dt */ + if (of_get_child_count(np) == 0) + return pdata; + for_each_child_of_node(np, child) { of_property_read_string(child, "charger-type", &type); |