* [PATCH v4 1/3] dt-bindings: document gpio-charger bindings
2014-09-23 20:42 [PATCH v4 0/3] gpio-charger: add devicetree support Heiko Stuebner
@ 2014-09-23 20:42 ` Heiko Stuebner
2014-09-23 20:42 ` [PATCH v4 2/3] power: gpio-charger: add device tree support Heiko Stuebner
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Heiko Stuebner @ 2014-09-23 20:42 UTC (permalink / raw)
To: sre, dbaryshkov, dwmw2
Cc: linux-pm, linux-kernel, devicetree, robh+dt, mark.rutland,
pawel.moll, ijc+devicetree, galak, dianders, heiko,
Heiko Stuebner
From: Heiko Stuebner <heiko.stuebner@bq.com>
This documents the binding for the gpio-charger power-supply.
Signed-off-by: Heiko Stuebner <heiko.stuebner@bq.com>
Reviewed-by: Doug Anderson <dianders@chromium.org>
---
.../bindings/power_supply/gpio-charger.txt | 27 ++++++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 Documentation/devicetree/bindings/power_supply/gpio-charger.txt
diff --git a/Documentation/devicetree/bindings/power_supply/gpio-charger.txt b/Documentation/devicetree/bindings/power_supply/gpio-charger.txt
new file mode 100644
index 0000000..adbb5dc
--- /dev/null
+++ b/Documentation/devicetree/bindings/power_supply/gpio-charger.txt
@@ -0,0 +1,27 @@
+gpio-charger
+
+Required properties :
+ - compatible : "gpio-charger"
+ - gpios : GPIO indicating the charger presence.
+ See GPIO binding in bindings/gpio/gpio.txt .
+ - charger-type : power supply type, one of
+ unknown
+ battery
+ ups
+ mains
+ usb-sdp (USB standard downstream port)
+ usb-dcp (USB dedicated charging port)
+ usb-cdp (USB charging downstream port)
+ usb-aca (USB accessory charger adapter)
+
+Example:
+
+ usb_charger: charger {
+ compatible = "gpio-charger";
+ charger-type = "usb-sdp";
+ gpios = <&gpf0 2 0 0 0>;
+ }
+
+ battery {
+ power-supplies = <&usb_charger>;
+ };
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v4 2/3] power: gpio-charger: add device tree support
2014-09-23 20:42 [PATCH v4 0/3] gpio-charger: add devicetree support Heiko Stuebner
2014-09-23 20:42 ` [PATCH v4 1/3] dt-bindings: document gpio-charger bindings Heiko Stuebner
@ 2014-09-23 20:42 ` Heiko Stuebner
2014-09-23 20:42 ` Heiko Stuebner
2014-10-26 12:06 ` [PATCH v4 0/3] gpio-charger: add devicetree support Heiko Stübner
3 siblings, 0 replies; 7+ messages in thread
From: Heiko Stuebner @ 2014-09-23 20:42 UTC (permalink / raw)
To: sre, dbaryshkov, dwmw2
Cc: linux-pm, linux-kernel, devicetree, robh+dt, mark.rutland,
pawel.moll, ijc+devicetree, galak, dianders, heiko,
Heiko Stuebner
From: Heiko Stuebner <heiko.stuebner@bq.com>
Add the ability to parse gpio-charger data from a devicetree node.
Signed-off-by: Heiko Stuebner <heiko.stuebner@bq.com>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Tested-by: Doug Anderson <dianders@chromium.org>
---
drivers/power/gpio-charger.c | 72 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 70 insertions(+), 2 deletions(-)
diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c
index a0024b2..22f084a 100644
--- a/drivers/power/gpio-charger.c
+++ b/drivers/power/gpio-charger.c
@@ -22,6 +22,8 @@
#include <linux/platform_device.h>
#include <linux/power_supply.h>
#include <linux/slab.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
#include <linux/power/gpio-charger.h>
@@ -69,6 +71,59 @@ static enum power_supply_property gpio_charger_properties[] = {
POWER_SUPPLY_PROP_ONLINE,
};
+static
+struct gpio_charger_platform_data *gpio_charger_parse_dt(struct device *dev)
+{
+ struct device_node *np = dev->of_node;
+ struct gpio_charger_platform_data *pdata;
+ const char *chargetype;
+ enum of_gpio_flags flags;
+ int ret;
+
+ if (!np)
+ return ERR_PTR(-ENOENT);
+
+ pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+ if (!pdata)
+ return ERR_PTR(-ENOMEM);
+
+ pdata->name = np->name;
+
+ pdata->gpio = of_get_gpio_flags(np, 0, &flags);
+ if (pdata->gpio < 0) {
+ if (pdata->gpio != -EPROBE_DEFER)
+ dev_err(dev, "could not get charger gpio\n");
+ return ERR_PTR(pdata->gpio);
+ }
+
+ pdata->gpio_active_low = !!(flags & OF_GPIO_ACTIVE_LOW);
+
+ pdata->type = POWER_SUPPLY_TYPE_UNKNOWN;
+ ret = of_property_read_string(np, "charger-type", &chargetype);
+ if (ret >= 0) {
+ if (!strncmp("unknown", chargetype, 7))
+ pdata->type = POWER_SUPPLY_TYPE_UNKNOWN;
+ else if (!strncmp("battery", chargetype, 7))
+ pdata->type = POWER_SUPPLY_TYPE_BATTERY;
+ else if (!strncmp("ups", chargetype, 3))
+ pdata->type = POWER_SUPPLY_TYPE_UPS;
+ else if (!strncmp("mains", chargetype, 5))
+ pdata->type = POWER_SUPPLY_TYPE_MAINS;
+ else if (!strncmp("usb-sdp", chargetype, 7))
+ pdata->type = POWER_SUPPLY_TYPE_USB;
+ else if (!strncmp("usb-dcp", chargetype, 7))
+ pdata->type = POWER_SUPPLY_TYPE_USB_DCP;
+ else if (!strncmp("usb-cdp", chargetype, 7))
+ pdata->type = POWER_SUPPLY_TYPE_USB_CDP;
+ else if (!strncmp("usb-aca", chargetype, 7))
+ pdata->type = POWER_SUPPLY_TYPE_USB_ACA;
+ else
+ dev_warn(dev, "unknown charger type %s\n", chargetype);
+ }
+
+ return pdata;
+}
+
static int gpio_charger_probe(struct platform_device *pdev)
{
const struct gpio_charger_platform_data *pdata = pdev->dev.platform_data;
@@ -78,8 +133,13 @@ static int gpio_charger_probe(struct platform_device *pdev)
int irq;
if (!pdata) {
- dev_err(&pdev->dev, "No platform data\n");
- return -EINVAL;
+ pdata = gpio_charger_parse_dt(&pdev->dev);
+ if (IS_ERR(pdata)) {
+ ret = PTR_ERR(pdata);
+ if (ret != -EPROBE_DEFER)
+ dev_err(&pdev->dev, "No platform data\n");
+ return ret;
+ }
}
if (!gpio_is_valid(pdata->gpio)) {
@@ -103,6 +163,7 @@ static int gpio_charger_probe(struct platform_device *pdev)
charger->get_property = gpio_charger_get_property;
charger->supplied_to = pdata->supplied_to;
charger->num_supplicants = pdata->num_supplicants;
+ charger->of_node = pdev->dev.of_node;
ret = gpio_request(pdata->gpio, dev_name(&pdev->dev));
if (ret) {
@@ -189,6 +250,12 @@ static int gpio_charger_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(gpio_charger_pm_ops,
gpio_charger_suspend, gpio_charger_resume);
+static const struct of_device_id gpio_charger_match[] = {
+ { .compatible = "gpio-charger" },
+ { }
+};
+MODULE_DEVICE_TABLE(of, gpio_charger_match);
+
static struct platform_driver gpio_charger_driver = {
.probe = gpio_charger_probe,
.remove = gpio_charger_remove,
@@ -196,6 +263,7 @@ static struct platform_driver gpio_charger_driver = {
.name = "gpio-charger",
.owner = THIS_MODULE,
.pm = &gpio_charger_pm_ops,
+ .of_match_table = gpio_charger_match,
},
};
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v4 3/3] power: gpio-charger: do not use gpio value directly
@ 2014-09-23 20:42 ` Heiko Stuebner
0 siblings, 0 replies; 7+ messages in thread
From: Heiko Stuebner @ 2014-09-23 20:42 UTC (permalink / raw)
To: sre, dbaryshkov, dwmw2
Cc: linux-pm, linux-kernel, devicetree, robh+dt, mark.rutland,
pawel.moll, ijc+devicetree, galak, dianders, heiko,
Heiko Stuebner
From: Heiko Stuebner <heiko.stuebner@bq.com>
Some gpio implementations return interesting values for gpio_get_value when
the value is not 0 - as seen on a imx6sl board. Therefore do not use the
value returned from gpio_get_value directly but simply check for 0 or not 0.
Signed-off-by: Heiko Stuebner <heiko.stuebner@bq.com>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Tested-by: Doug Anderson <dianders@chromium.org>
---
drivers/power/gpio-charger.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c
index 22f084a..7d4eab2 100644
--- a/drivers/power/gpio-charger.c
+++ b/drivers/power/gpio-charger.c
@@ -57,7 +57,7 @@ static int gpio_charger_get_property(struct power_supply *psy,
switch (psp) {
case POWER_SUPPLY_PROP_ONLINE:
- val->intval = gpio_get_value_cansleep(pdata->gpio);
+ val->intval = !!gpio_get_value_cansleep(pdata->gpio);
val->intval ^= pdata->gpio_active_low;
break;
default:
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v4 0/3] gpio-charger: add devicetree support
2014-09-23 20:42 [PATCH v4 0/3] gpio-charger: add devicetree support Heiko Stuebner
` (2 preceding siblings ...)
2014-09-23 20:42 ` Heiko Stuebner
@ 2014-10-26 12:06 ` Heiko Stübner
2014-10-27 15:55 ` Sebastian Reichel
3 siblings, 1 reply; 7+ messages in thread
From: Heiko Stübner @ 2014-10-26 12:06 UTC (permalink / raw)
To: sre
Cc: dbaryshkov, dwmw2, linux-pm, linux-kernel, devicetree, robh+dt,
mark.rutland, pawel.moll, ijc+devicetree, galak, dianders
Hi Sebastian,
Am Dienstag, 23. September 2014, 22:42:13 schrieb Heiko Stuebner:
> This series adds devicetree support to the gpio-charger and fixes a small
> issue with the return value of gpio_get_value.
>
> changes since v3:
> - remove of_match_ptr. All used of_xx function have stubs for !OF
> and of_device_id also is always defined, so no need for of_match_ptr
> changes since v2:
> - fix (hopefully all) issues pointed out by Doug Anderson
> - add missing of_node assignment to charger
> changes since v1:
> - adapt binding example to show how the charger fits into the
> power-supplies structure
>
>
> Heiko Stuebner (3):
> dt-bindings: document gpio-charger bindings
> power: gpio-charger: add device tree support
> power: gpio-charger: do not use gpio value directly
I can see patch3 in your tree (and 3.18-rc). Will you take patches 1 and 2 for
3.19?
The generally used 3 week period for devicetree-binding related complaints
also should be over by now.
Heiko
^ permalink raw reply [flat|nested] 7+ messages in thread