power: bq24617: Adding initial charger support
PATCH v2 1/1 power: bq24617: Adding initial charger support
From: Rhyland Klein <[email protected]>
Initial checkin adding basic support for the TI BQ24617 battery charger where the PG output is directed to the driver via a gpio. This gpio address needs to be passed in the platform data to the driver.
---
Addressed comments by Mark Brown
* Removed dependency on TEGRA, changed to GPIO
* now using power_supply_changed()
* now using request_threaded_irq()
drivers/power/Kconfig | 7 ++ drivers/power/Makefile | 1 + drivers/power/bq24617.c | 262 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/bq24617.h | 10 ++ 4 files changed, 280 insertions(+), 0 deletions(-) create mode 100644 drivers/power/bq24617.c create mode 100644 include/linux/bq24617.h
drivers/power/Kconfig +7 -0
@@ -185,4 +185,11 @@ config CHARGER_TWL4030 help Say Y here to enable support for TWL4030 Battery Charge Interface. +config CHARGER_BQ24617 + tristate "BQ24617 battery charger" + depends on I2C && GENERIC_GPIO + help + Say Y to include support for the TI BQ24617 battery charger where PG + is attached to a gpio. + endif # POWER_SUPPLY
drivers/power/Makefile +1 -0
@@ -32,3 +32,4 @@ obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o +obj-$(CONFIG_CHARGER_BQ24617) += bq24617.o
drivers/power/bq24617.c new file +262 -0
262 lines not on this page · raw message
include/linux/bq24617.h new file +10 -0
@@ -0,0 +1,10 @@ +#ifndef _LINUX_BQ24617_H +#define _LINUX_BQ24617_H + +struct bq24617_platform_data { +int gpio_addr; +char **batteries; +int num_batteries; +}; + +#endif
Signature · 1 line
1.7.0.4
Hi
Quoted 5 lines · [email protected] wrote:
From: Rhyland Klein <[email protected]>
Initial checkin adding basic support for the TI BQ24617 battery charger where the PG output is directed to the driver via a gpio. This gpio address needs to be passed in the platform data to the driver.
There is not really anything specific to the BQ24617 in this driver except for the naming. It is a driver for charger which reports its online property through a gpio pin. I wrote a similar which I wanted to submit for 2.6.38. I'll send it as a reply to this mail. You'll might be able to reuse it.
Quoted 21 lines
Signed-off-by Rhyland Klein <[email protected]>---
Addressed comments by Mark Brown
* Removed dependency on TEGRA, changed to GPIO
* now usingpower_supply_changed()
* now usingrequest_threaded_irq()drivers/power/Kconfig | 7 ++ drivers/power/Makefile | 1 + drivers/power/bq24617.c | 262 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/bq24617.h | 10 ++ 4 files changed, 280 insertions(+), 0 deletions(-) create mode 100644 drivers/power/bq24617.c create mode 100644 include/linux/bq24617.hdrivers/power/Kconfig +0
-0
drivers/power/Kconfig config CHARGER_TWL4030 · line 190
Quoted 6 lines
drivers/power/Kconfig +3
-0@@ -185,4 +185,11 @@ config CHARGER_TWL4030 help Say Y here to enable support for TWL4030 Battery Charge Interface. +config CHARGER_BQ24617 + tristate "BQ24617 battery charger" + depends on I2C && GENERIC_GPIO
The driver does not use any I2C functions, so it shouldn't depend on I2C
Quoted 72 lines
drivers/power/Kconfig +4
-0+ help + Say Y to include support for the TI BQ24617 battery charger where PG + is attached to a gpio. + endif # POWER_SUPPLYdrivers/power/Makefile +1
-0@@ -32,3 +32,4 @@ obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o +obj-$(CONFIG_CHARGER_BQ24617) += bq24617.odrivers/power/bq24617.c new file +52
-0@@ -0,0 +1,262 @@ +/* +* Charger driver for TI's BQ24617 +* +* Copyright (c) 2010, NVIDIA Corporation. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/err.h> +#include <linux/power_supply.h> +#include <linux/slab.h> +#include <linux/gpio.h> +#include <linux/bq24617.h> +#include <linux/interrupt.h> +#include <linux/platform_device.h> +#include <linux/irq.h> + +struct bq24617_info { +struct power_supply power_supply; +struct bq24617_platform_data *pdata; +struct platform_device *pdev; +struct mutex work_lock; +struct work_struct ac_work; +int status; +}; + +static enum power_supply_property bq24617_properties[] = { +POWER_SUPPLY_PROP_ONLINE , +}; + +static void bq24617_batt_update (struct bq24617_info *chip) +{ +int old_status = chip->status; +int new_status = old_status; +struct bq24617_platform_data *pdata; +int gpio_value =0 ; +
drivers/power/bq24617.c line 62
Quoted 10 lines
drivers/power/bq24617.c new file +10
-0+ pdata = chip->pdata; + +mutex_lock (&chip->work_lock); + + gpio_value =gpio_get_value (pdata->gpio_addr); + + new_status = !gpio_value; + chip->status = new_status; + +mutex_unlock (&chip->work_lock);
The mutex in its current form is quite useless since it does not protect against anything. In my opinion it can be dropped completly. There is then a chance that power_supply_changed is called twice although there was only one change, but that should not cause any problems.
If you want to keep the lock you should move "old_status = chip->status" inside the the lock (And gpio_get_value out of it).
drivers/power/bq24617.c line 64
Quoted 2 lines
drivers/power/bq24617.c new file +2
-0+ + if (old_status != -1 &&
If old_status is -1 it wont be equal to new_status so there is no need for an extra check.
Quoted 4 lines
drivers/power/bq24617.c new file +4
-0+ old_status != new_status) { +dev_dbg (&chip->pdev->dev, +"%s: %i -> %i\n" , __func__, old_status, + new_status);
drivers/power/bq24617.c line 78
Quoted 10 lines
drivers/power/bq24617.c new file +10
-0+power_supply_changed (&chip->power_supply); + } + +} + +static irqreturn_t bq24617_irq_switch (int irq,void *devid) +{ +struct bq24617_info *chip = devid; + +schedule_work (&chip->ac_work);
What Mark meant is that you should use a threaded irq so you can get rid of the workqueue and call bq24617_batt_update directly from inside the irq handler.
Quoted 23 lines
drivers/power/bq24617.c new file +23
-0+ +return IRQ_HANDLED ; +} + +static int bq24617_get_property (struct power_supply *psy, +enum power_supply_property psp, +union power_supply_propval *val) +{ + struct bq24617_info *chip = container_of(psy, struct bq24617_info, + power_supply); + +switch (psp) { +case POWER_SUPPLY_PROP_ONLINE : +bq24617_batt_update (chip); + val->intval = chip->status; +break ; +default : +dev_err (&chip->pdev->dev, +"%s: Unknown property requested.\n" , __func__); +return -EINVAL ; +break ; + } +return 0 ;
drivers/power/bq24617.c line 111
Quoted 10 lines
drivers/power/bq24617.c new file +10
-0+} + +static void bq24617_ac_work (struct work_struct *work) +{ +struct bq24617_info *chip; + chip = container_of(work, struct bq24617_info, ac_work); +bq24617_batt_update (chip); +} + +static int bq24617_probe (struct platform_device *pdev)
__devinit
Quoted 53 lines
drivers/power/bq24617.c new file +53
-0+{ +struct bq24617_info *chip; +struct bq24617_platform_data *pdata = pdev->dev.platform_data; +int rc; + +if (!pdata) { +dev_err (&pdev->dev,"No platform data\n" ); +return -ENXIO ; + } + +if (!(gpio_is_valid (pdata->gpio_addr))) { +dev_err (&pdev->dev,"Gpio is not valid\n" ); +return -EINVAL ; + } + + chip =kzalloc (sizeof (struct bq24617_info ),GFP_KERNEL ); +if (!chip) +return -ENOMEM ; + + chip->pdata = pdata; + chip->pdev = pdev; + chip->power_supply.name ="ac" ; + chip->status =-1 ;/* set status to reflect unset */ + chip->power_supply.type =POWER_SUPPLY_TYPE_MAINS ; + chip->power_supply.properties = bq24617_properties; + chip->power_supply.num_properties =ARRAY_SIZE (bq24617_properties); + chip->power_supply.get_property = bq24617_get_property; + chip->power_supply.supplied_to = pdata->batteries; + chip->power_supply.num_supplicants = pdata->num_batteries; + +mutex_init (&chip->work_lock); + +platform_set_drvdata (pdev, chip); + + rc =gpio_request (pdata->gpio_addr,"ac online" ); +if (rc) { +dev_err (&pdev->dev, +"%s: Failed to get gpio\n" , __func__); + goto free_chip; + } + +gpio_direction_input (pdata->gpio_addr); +if (rc) { +dev_err (&pdev->dev, +"%s: Failed to set gpio direction\n" , + __func__); + goto release_gpio; + } + + rc = request_threaded_irq (gpio_to_irq(pdata->gpio_addr), + NULL, + bq24617_irq_switch, + IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
drivers/power/bq24617.c line 174
Quoted 10 lines
drivers/power/bq24617.c new file +10
-0+"ac detect" , + chip); + +if (rc) { +dev_err (&pdev->dev, +"%s: Failed to request threaded IRQ\n" , __func__); + goto release_gpio; + } + +INIT_WORK (&chip->ac_work, bq24617_ac_work);
In theory the irq can fire before the work_struct has been initalised.
Quoted 15 lines
drivers/power/bq24617.c new file +15
-0+ + rc =power_supply_register (&pdev->dev, &chip->power_supply); +if (rc) { +dev_err (&pdev->dev, +"%s: Failed to register power supply\n" , __func__); + goto free_irq; + } + +dev_info (&pdev->dev, +"%s: battery charger ac device registered\n" , pdev->name); + +schedule_work (&chip->ac_work); + +return 0 ; +
drivers/power/bq24617.c line 199
Quoted 10 lines
drivers/power/bq24617.c new file +10
-0+free_irq: +free_irq (gpio_to_irq (pdata->gpio_addr), chip); +release_gpio: +gpio_free (pdata->gpio_addr); +free_chip: +kfree (chip); +return rc; +} + +static int bq24617_remove (struct platform_device *pdev)
__devexit
Quoted 39 lines
drivers/power/bq24617.c new file +39
-0+{ +struct bq24617_info *chip =platform_get_drvdata (pdev); +struct bq24617_platform_data *pdata = chip->pdata; + +flush_scheduled_work (); + +power_supply_unregister (&chip->power_supply); + +free_irq (gpio_to_irq (pdata->gpio_addr), chip); +gpio_free (pdata->gpio_addr); +kfree (chip); + +return 0 ; +} + +#if CONFIG_PM +static int bq24617_suspend (struct platform_device *pdev,pm_message_t state) +{ +flush_scheduled_work (); + +return 0 ; +} + +static int bq24617_resume (struct platform_device *pdev) +{ +struct bq24617_info *chip =platform_get_drvdata (pdev); + +schedule_work (&chip->ac_work); + +return 0 ; +} + +#else +#define bq24617_suspend NULL +#define bq24617_resume NULL +#endif + +static struct platform_driver bq24617_driver = { + .driver = {
drivers/power/bq24617.c line 248
Quoted 10 lines
drivers/power/bq24617.c new file +10
-0+ .name = "bq24617", + .owner = THIS_MODULE, + }, + .probe = bq24617_probe, + .remove = __devexit_p(bq24617_remove), + .suspend = bq24617_suspend, + .resume = bq24617_resume, +}; + +static int __devinit bq24617_init (void )
__init
drivers/power/bq24617.c line 254
Quoted 6 lines
drivers/power/bq24617.c new file +6
-0+{ +return platform_driver_register (&bq24617_driver); +} +module_init (bq24617_init); + +static void __devexit bq24617_exit(void)
__exit
drivers/power/bq24617.c line 262
Quoted 8 lines
drivers/power/bq24617.c new file +8
-0+{ +platform_driver_unregister (&bq24617_driver); +} +module_exit (bq24617_exit); + +MODULE_AUTHOR ("Rhyland Klein <[email protected]" ); +MODULE_DESCRIPTION ("BQ24617 battery charger driver" ); +MODULE_LICENSE ("GPL" );
- Lars
PATCH 1/1 POWER: Add gpio chager driver
This patch adds a simple driver for chargers indicating their online status through a GPIO pin.
--- drivers/power/Kconfig | 10 ++ drivers/power/Makefile | 1 + drivers/power/gpio-charger.c | 184 ++++++++++++++++++++++++++++++++++++ include/linux/power/gpio-charger.h | 39 ++++++++ 4 files changed, 234 insertions(+), 0 deletions(-) create mode 100644 drivers/power/gpio-charger.c create mode 100644 include/linux/power/gpio-charger.h
drivers/power/Kconfig +10 -0
@@ -166,4 +166,14 @@ config BATTERY_INTEL_MID Say Y here to enable the battery driver on Intel MID platforms. +config CHARGER_GPIO + tristate "GPIO charger" + depends on GPIOLIB + help + Say Y to include support for chargers which report their online status + through a GPIO pin. + + This driver can be build as a module. If so, the module will be + called gpio-chager. + endif # POWER_SUPPLY
drivers/power/Makefile +1 -0
@@ -37,3 +37,4 @@ obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o +obj-$(CONFIG_CHARGER_GPIO) += gpio-charger.o
drivers/power/gpio-charger.c new file +184 -0
184 lines not on this page · raw message
include/linux/power/gpio-charger.h new file +39 -0
@@ -0,0 +1,39 @@ +/* +* Copyright (C) 2010, Lars-Peter Clausen <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, write to the Free Software Foundation, Inc., +* 675 Mass Ave, Cambridge, MA 02139, USA. +* +*/ + +#ifndef __LINUX_POWER_GPIO_CHARGER_H__ +#define __LINUX_POWER_GPIO_CHARGER_H__ + +/* +* struct gpio_charger_platform_data - platform_data for gpio_charger devices +* @name: Name for the chargers power_supply device +* @type: Type of the charger +* @gpio: GPIO which is used to indicate the chargers status +* @gpio_active_low: Should be set to 1 if the GPIO is active low otherwise 0 +* @supplied_to: Array of battery names to which this chargers supplies power +* @num_supplicants: Number of entries in the supplied_to array +*/ + +struct gpio_charger_platform_data { +const char *name; +enum power_supply_type type; + +int gpio; +int gpio_active_low; + +char **supplied_to; +size_t num_supplicants; +}; + +#endif
Signature · 1 line
1.5.6.5
Re: [PATCH] POWER: Add gpio chager driver
Quoted 20 lines · Lars-Peter Clausen
This patch adds a simple driver for chargers indicating their online status through a GPIO pin.
Signed-off-by Lars-Peter Clausen<[email protected]>--- drivers/power/Kconfig | 10 ++ drivers/power/Makefile | 1 + drivers/power/gpio-charger.c | 184 ++++++++++++++++++++++++++++++++++++ include/linux/power/gpio-charger.h | 39 ++++++++ 4 files changed, 234 insertions(+), 0 deletions(-)create mode 100644
drivers/power/gpio-charger.ccreate mode 100644include/linux/power/gpio-charger.hdrivers/power/Kconfig +0
-0@@ -166,4 +166,14 @@ config BATTERY_INTEL_MID Say Y here to enable the battery driver on Intel MID platforms.
drivers/power/Kconfig config BATTERY_INTEL_MID · line 177
Quoted 10 lines
drivers/power/Kconfig +9
-0+config CHARGER_GPIO + tristate "GPIO charger" + depends on GPIOLIB + help + Say Y to include support for chargers which report their online status + through a GPIO pin. + + This driver can be build as a module. If so, the module will be + called gpio-chager.
Shouldn't it say gpio-charger not gpio-chager? A typo.
Regards,
Piotr Hosowicz
Signature · 5 lines
Radzieccy neurolodzy odkryli nerw łączący oko bezpośrednio z dupą. Kiedy ukłuli pacjenta igłą w dupę, w jego oku pojawiła się łza. Kiedy wbili tę samą igłę w oko, pacjent się zesrał. NP: Peter Green Splinter Group - Indians NB: 2.6.36
Re: [PATCH] POWER: Add gpio chager driver
Quoted 37 lines · Piotr Hosowicz
Quoted 29 lines · Lars-Peter Clausen
This patch adds a simple driver for chargers indicating their online status
through a GPIO pin.Signed-off-by Lars-Peter Clausen<[email protected]>--- drivers/power/Kconfig | 10 ++ drivers/power/Makefile | 1 + drivers/power/gpio-charger.c | 184 ++++++++++++++++++++++++++++++++++++ include/linux/power/gpio-charger.h | 39 ++++++++ 4 files changed, 234 insertions(+), 0 deletions(-)create mode 100644
drivers/power/gpio-charger.ccreate mode 100644include/linux/power/gpio-charger.hdrivers/power/Kconfig +5
-0@@ -166,4 +166,14 @@ config BATTERY_INTEL_MID Say Y here to enable the battery driver on Intel MID platforms. +config CHARGER_GPIO + tristate "GPIO charger" + depends on GPIOLIB + help + Say Y to include support for chargers which report their onlinestatus
drivers/power/Kconfig config BATTERY_INTEL_MID · line 177
Quoted 4 lines
drivers/power/Kconfig +4
-0+ through a GPIO pin. + + This driver can be build as a module. If so, the module will be + called gpio-chager.Shouldn't it say gpio-charger not gpio-chager? A typo.
Quoted 4 lines
Regards,
Piotr Hosowicz
Hi
Yes, thanks.
- Lars
Re: [PATCH] POWER: Add gpio chager driver
In reply to Lars-Peter ClausenQuoted 4 lines · Lars-Peter Clausen
This patch adds a simple driver for chargers indicating their online status through a GPIO pin.
Signed-off-by Lars-Peter Clausen <[email protected]>
I agree, the GPIO name fits better. Rhyland, are you OK with that driver, does it fit your needs?
Some comments down below.
[...]
drivers/power/gpio-charger.c line 30
Quoted 3 lines
drivers/power/gpio-charger.c new file +3
-0+struct gpio_charger { +const struct gpio_charger_platform_data *pdata; +int irq;
This can be unsigned.
drivers/power/gpio-charger.c line 37
Quoted 7 lines
drivers/power/gpio-charger.c new file +7
-0+ +struct power_supply charger; +}; + +static irqreturn_t gpio_charger_irq (int irq,void *devid) +{ +struct power_supply *charger = devid;
Please add an empty line here.
drivers/power/gpio-charger.c line 49
Quoted 12 lines
drivers/power/gpio-charger.c new file +12
-0+power_supply_changed (charger); + +return IRQ_HANDLED ; +} + +static inline struct gpio_charger *psy_to_gpio_charger (struct power_supply *psy) +{ + return container_of(psy, struct gpio_charger, charger); +} + +static int gpio_charger_get_property (struct power_supply *psy, +enum power_supply_property psp,union power_supply_propval *val)
One more tab for here?
Quoted 52 lines
drivers/power/gpio-charger.c new file +52
-0+{ +struct gpio_charger *gpio_charger =psy_to_gpio_charger (psy); +const struct gpio_charger_platform_data *pdata = gpio_charger->pdata; + +switch (psp) { +case POWER_SUPPLY_PROP_ONLINE : + val->intval =gpio_get_value (pdata->gpio); + val->intval ^= pdata->gpio_active_low; +break ; +default : +return -EINVAL ; + } + +return 0 ; +} + +static enum power_supply_property gpio_charger_properties[] = { +POWER_SUPPLY_PROP_ONLINE , +}; + +static int __devinit gpio_charger_probe (struct platform_device *pdev) +{ +const struct gpio_charger_platform_data *pdata = pdev->dev.platform_data; +struct gpio_charger *gpio_charger; +struct power_supply *charger; +int ret; + +if (!pdata) { +dev_err (&pdev->dev,"No platform data" ); +return -EINVAL ; + } + +if (!gpio_is_valid (pdata->gpio)) { +dev_err (&pdev->dev,"Invalid gpio pin\n" ); +return -EINVAL ; + } + + gpio_charger =kzalloc (sizeof (*gpio_charger),GFP_KERNEL ); + + charger = &gpio_charger->charger; + + charger->name = pdata->name; + charger->type = pdata->type; + charger->properties = gpio_charger_properties; + charger->num_properties =ARRAY_SIZE (gpio_charger_properties); + charger->get_property = gpio_charger_get_property; + charger->supplied_to = pdata->supplied_to; + charger->num_supplicants = pdata->num_supplicants; + + ret =gpio_request (pdata->gpio,dev_name (&pdev->dev)); +if (ret) { +dev_err (&pdev->dev,"Failed to request gpio pin: %d\n" , ret);
drivers/power/gpio-charger.c line 111
Quoted 10 lines
drivers/power/gpio-charger.c new file +10
-0+ goto err_free; + } + ret =gpio_direction_input (pdata->gpio); +if (ret) { +dev_err (&pdev->dev,"Failed to set gpio to input: %d\n" , ret); + goto err_gpio_free; + } + + gpio_charger->irq =gpio_to_irq (pdata->gpio); +if (gpio_charger->irq >=0 ) {
0 isn't valid IRQ number. The check should be just 'if (gpio_charger->irq)'.
Quoted 87 lines
drivers/power/gpio-charger.c new file +73
-0+ ret =request_irq (gpio_charger->irq, gpio_charger_irq, +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , +dev_name (&pdev->dev), charger); +if (ret) { +dev_warn (&pdev->dev,"Failed to request gpio irq: %d\n" , ret); + gpio_charger->irq =-1 ; + } + } + + gpio_charger->pdata = pdata; + + ret =power_supply_register (&pdev->dev, charger); +if (ret <0 ) { +dev_err (&pdev->dev,"Failed to register power supply: %d\n" , ret); + goto err_irq_free; + } + +platform_set_drvdata (pdev, gpio_charger); + +return 0 ; + +err_irq_free: +if (gpio_charger->irq >=0 ) +free_irq (gpio_charger->irq, charger); +err_gpio_free: +gpio_free (pdata->gpio); +err_free: +kfree (gpio_charger); +return ret; +} + +static int __devexit gpio_charger_remove(struct platform_device *pdev) +{ +struct gpio_charger *gpio_charger =platform_get_drvdata (pdev); +const struct gpio_charger_platform_data *pdata = gpio_charger->pdata; + +power_supply_unregister (&gpio_charger->charger); + +if (gpio_charger->irq >=0 ) +free_irq (gpio_charger->irq, &gpio_charger->charger); +gpio_free (pdata->gpio); + +platform_set_drvdata (pdev,NULL ); +kfree (gpio_charger); + +return 0 ; +} + +static struct platform_driver gpio_charger_driver = { + .probe = gpio_charger_probe, + .remove =__devexit_p (gpio_charger_remove), + .driver = { + .name ="gpio-charger" , + .owner =THIS_MODULE , + }, +}; + +static int __init gpio_charger_init (void ) +{ +return platform_driver_register (&gpio_charger_driver); +} +module_init (gpio_charger_init); + +static void __exit gpio_charger_exit(void) +{ +platform_driver_unregister (&gpio_charger_driver); +} +module_exit (gpio_charger_exit); + +MODULE_AUTHOR ("Lars-Peter Clausen <[email protected]>" ); +MODULE_DESCRIPTION ("Driver for chargers which report their online status through a GPIO" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:gpio-charger" );include/linux/power/gpio-charger.h new file +8
-0@@ -0,0 +1,39 @@ +/* +* Copyright (C) 2010, Lars-Peter Clausen <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +*
include/linux/power/gpio-charger.h line 18
Quoted 10 lines
include/linux/power/gpio-charger.h new file +10
-0+* You should have received a copy of the GNU General Public License along +* with this program; if not, write to the Free Software Foundation, Inc., +* 675 Mass Ave, Cambridge, MA 02139, USA. +* +*/ + +#ifndef __LINUX_POWER_GPIO_CHARGER_H__ +#define __LINUX_POWER_GPIO_CHARGER_H__ + +/*
Should be /**
include/linux/power/gpio-charger.h line 27
Quoted 9 lines
include/linux/power/gpio-charger.h new file +9
-0+* struct gpio_charger_platform_data - platform_data for gpio_charger devices +* @name: Name for the chargers power_supply device +* @type: Type of the charger +* @gpio: GPIO which is used to indicate the chargers status +* @gpio_active_low: Should be set to 1 if the GPIO is active low otherwise 0 +* @supplied_to: Array of battery names to which this chargers supplies power +* @num_supplicants: Number of entries in the supplied_to array +*/ +
No need for this empty line.
include/linux/power/gpio-charger.h line 30
Quoted 3 lines
include/linux/power/gpio-charger.h new file +3
-0+struct gpio_charger_platform_data { +const char *name; +enum power_supply_type type;
#include <linux/power_supply.h> is needed for this.
include/linux/power/gpio-charger.h line 36
Quoted 6 lines
include/linux/power/gpio-charger.h new file +6
-0+ +int gpio; +int gpio_active_low; + +char **supplied_to; +size_t num_supplicants;
And #include <linux/types.h> for this.
include/linux/power/gpio-charger.h line 39
Quoted 3 lines
include/linux/power/gpio-charger.h new file +3
-0+}; + +#endif
Thanks!
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2
Re: [PATCH] POWER: Add gpio chager driver
Quoted 9 lines · Anton Vorontsov
Quoted 4 lines · Lars-Peter Clausen
This patch adds a simple driver for chargers indicating their online status through a GPIO pin.
Signed-off-by Lars-Peter Clausen <[email protected]>I agree, the GPIO name fits better. Rhyland, are you OK with that driver, does it fit your needs?
Quoted 8 lines
Some comments down below.
[...]
drivers/power/gpio-charger.c line 30
Quoted 3 lines
drivers/power/gpio-charger.c new file +3
-0+struct gpio_charger { +const struct gpio_charger_platform_data *pdata; +int irq;This can be unsigned.
If the gpio has no irq or the irq could not be requested the irq fields value is negative.
Quoted 11 lines
drivers/power/gpio-charger.c line 37
Quoted 8 lines
drivers/power/gpio-charger.c new file +7
-0+ +struct power_supply charger; +}; + +static irqreturn_t gpio_charger_irq (int irq,void *devid) +{ +struct power_supply *charger = devid;Please add an empty line here.
Quoted 15 lines
drivers/power/gpio-charger.c line 49
Quoted 12 lines
drivers/power/gpio-charger.c new file +12
-0+power_supply_changed (charger); + +return IRQ_HANDLED ; +} + +static inline struct gpio_charger *psy_to_gpio_charger (struct power_supply *psy) +{ + return container_of(psy, struct gpio_charger, charger); +} + +static int gpio_charger_get_property (struct power_supply *psy, +enum power_supply_property psp,union power_supply_propval *val)One more tab for here?
I prefer one tab, but I can change it.
Quoted 56 lines
Quoted 56 lines
drivers/power/gpio-charger.c new file +56
-0+{ +struct gpio_charger *gpio_charger =psy_to_gpio_charger (psy); +const struct gpio_charger_platform_data *pdata = gpio_charger->pdata; + +switch (psp) { +case POWER_SUPPLY_PROP_ONLINE : + val->intval =gpio_get_value (pdata->gpio); + val->intval ^= pdata->gpio_active_low; +break ; +default : +return -EINVAL ; + } + +return 0 ; +} + +static enum power_supply_property gpio_charger_properties[] = { +POWER_SUPPLY_PROP_ONLINE , +}; + +static int __devinit gpio_charger_probe (struct platform_device *pdev) +{ +const struct gpio_charger_platform_data *pdata = pdev->dev.platform_data; +struct gpio_charger *gpio_charger; +struct power_supply *charger; +int ret; + +if (!pdata) { +dev_err (&pdev->dev,"No platform data" ); +return -EINVAL ; + } + +if (!gpio_is_valid (pdata->gpio)) { +dev_err (&pdev->dev,"Invalid gpio pin\n" ); +return -EINVAL ; + } + + gpio_charger =kzalloc (sizeof (*gpio_charger),GFP_KERNEL ); + + charger = &gpio_charger->charger; + + charger->name = pdata->name; + charger->type = pdata->type; + charger->properties = gpio_charger_properties; + charger->num_properties =ARRAY_SIZE (gpio_charger_properties); + charger->get_property = gpio_charger_get_property; + charger->supplied_to = pdata->supplied_to; + charger->num_supplicants = pdata->num_supplicants; + + ret =gpio_request (pdata->gpio,dev_name (&pdev->dev)); +if (ret) { +dev_err (&pdev->dev,"Failed to request gpio pin: %d\n" , ret); + goto err_free; + } + ret =gpio_direction_input (pdata->gpio); +if (ret) {
Quoted 8 lines
drivers/power/gpio-charger.c line 111
Quoted 6 lines
drivers/power/gpio-charger.c new file +6
-0+dev_err (&pdev->dev,"Failed to set gpio to input: %d\n" , ret); + goto err_gpio_free; + } + + gpio_charger->irq =gpio_to_irq (pdata->gpio); +if (gpio_charger->irq >=0 ) {0 isn't valid IRQ number. The check should be just 'if (
gpio_charger->irq)'.
While it is unlikely to be used for an gpio IRQ, as far as I know 0 is a valid IRQ number.
Quoted 128 lines
Quoted 88 lines
drivers/power/gpio-charger.c new file +73
-0+ ret =request_irq (gpio_charger->irq, gpio_charger_irq, +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , +dev_name (&pdev->dev), charger); +if (ret) { +dev_warn (&pdev->dev,"Failed to request gpio irq: %d\n" , ret); + gpio_charger->irq =-1 ; + } + } + + gpio_charger->pdata = pdata; + + ret =power_supply_register (&pdev->dev, charger); +if (ret <0 ) { +dev_err (&pdev->dev,"Failed to register power supply: %d\n" , ret); + goto err_irq_free; + } + +platform_set_drvdata (pdev, gpio_charger); + +return 0 ; + +err_irq_free: +if (gpio_charger->irq >=0 ) +free_irq (gpio_charger->irq, charger); +err_gpio_free: +gpio_free (pdata->gpio); +err_free: +kfree (gpio_charger); +return ret; +} + +static int __devexit gpio_charger_remove(struct platform_device *pdev) +{ +struct gpio_charger *gpio_charger =platform_get_drvdata (pdev); +const struct gpio_charger_platform_data *pdata = gpio_charger->pdata; + +power_supply_unregister (&gpio_charger->charger); + +if (gpio_charger->irq >=0 ) +free_irq (gpio_charger->irq, &gpio_charger->charger); +gpio_free (pdata->gpio); + +platform_set_drvdata (pdev,NULL ); +kfree (gpio_charger); + +return 0 ; +} + +static struct platform_driver gpio_charger_driver = { + .probe = gpio_charger_probe, + .remove =__devexit_p (gpio_charger_remove), + .driver = { + .name ="gpio-charger" , + .owner =THIS_MODULE , + }, +}; + +static int __init gpio_charger_init (void ) +{ +return platform_driver_register (&gpio_charger_driver); +} +module_init (gpio_charger_init); + +static void __exit gpio_charger_exit(void) +{ +platform_driver_unregister (&gpio_charger_driver); +} +module_exit (gpio_charger_exit); + +MODULE_AUTHOR ("Lars-Peter Clausen <[email protected]>" ); +MODULE_DESCRIPTION ("Driver for chargers which report their online status through a GPIO" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:gpio-charger" );include/linux/power/gpio-charger.h new file +8
-0@@ -0,0 +1,39 @@ +/* +* Copyright (C) 2010, Lars-Peter Clausen <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* include/linux/power/gpio-charger.h line 18
Quoted 10 lines
include/linux/power/gpio-charger.h new file +10
-0+* You should have received a copy of the GNU General Public License along +* with this program; if not, write to the Free Software Foundation, Inc., +* 675 Mass Ave, Cambridge, MA 02139, USA. +* +*/ + +#ifndef __LINUX_POWER_GPIO_CHARGER_H__ +#define __LINUX_POWER_GPIO_CHARGER_H__ + +/* Should be /**
include/linux/power/gpio-charger.h line 27
Quoted 9 lines
include/linux/power/gpio-charger.h new file +9
-0+* struct gpio_charger_platform_data - platform_data for gpio_charger devices +* @name: Name for the chargers power_supply device +* @type: Type of the charger +* @gpio: GPIO which is used to indicate the chargers status +* @gpio_active_low: Should be set to 1 if the GPIO is active low otherwise 0 +* @supplied_to: Array of battery names to which this chargers supplies power +* @num_supplicants: Number of entries in the supplied_to array +*/ +No need for this empty line.
include/linux/power/gpio-charger.h line 30
Quoted 3 lines
include/linux/power/gpio-charger.h new file +3
-0+struct gpio_charger_platform_data { +const char *name; +enum power_supply_type type;#include <
linux/power_supply.h> is needed for this.include/linux/power/gpio-charger.h line 36
Quoted 6 lines
include/linux/power/gpio-charger.h new file +6
-0+ +int gpio; +int gpio_active_low; + +char **supplied_to; +size_t num_supplicants;And #include <
linux/types.h> for this.
Quoted 6 lines
include/linux/power/gpio-charger.h line 39
Quoted 3 lines
include/linux/power/gpio-charger.h new file +3
-0+}; + +#endif Thanks!
Thanks,
- Lars
Re: [PATCH] POWER: Add gpio chager driver
On Thu, Oct 21, 2010 at 04:52:37PM +0200, Lars-Peter Clausen wrote:
[...]
Quoted 7 lines
Quoted 4 lines
drivers/power/gpio-charger.c line 111
Quoted 2 lines
drivers/power/gpio-charger.c new file +2
-0+ gpio_charger->irq =gpio_to_irq (pdata->gpio); +if (gpio_charger->irq >=0 ) {0 isn't valid IRQ number. The check should be just 'if (
gpio_charger->irq)'.While it is unlikely to be used for an gpio IRQ, as far as I know 0 is a valid IRQ number.
0 may be a valid HW IRQ, but not VIRQ.
http://www.mail-archive.com/[email protected]/msg22857.html
Thanks,
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2
RE: [PATCH] POWER: Add gpio chager driver
In reply to Anton VorontsovQuoted 8 lines
From: Anton Vorontsov [mailto:[email protected]]
Sent: Thursday, October 21, 2010 7:14 AM
To: Lars-Peter Clausen
Cc: Rhyland Klein; [email protected]; Andrew Chew; [email protected]; [email protected]
Subject: Re: [PATCH] POWER: Add gpio chager driverOn Thu, Oct 21, 2010 at 02:25:57PM +0200, Lars-Peter Clausen wrote:
Quoted 8 lines
Quoted 1 line
This patch adds a simple driver for chargers indicating their online
status
Quoted 3 lines
through a GPIO pin.
Signed-off-by Lars-Peter Clausen <[email protected]>I agree, the GPIO name fits better. Rhyland, are you OK with that driver, does it fit your needs?
This would be great. I will give it a test but from reading over it, it sounds perfect for my needs.
Quoted 248 lines
Some comments down below.
[...]
drivers/power/gpio-charger.c line 30
Quoted 3 lines
drivers/power/gpio-charger.c new file +3
-0+struct gpio_charger { +const struct gpio_charger_platform_data *pdata; +int irq;This can be unsigned.
drivers/power/gpio-charger.c line 37
Quoted 7 lines
drivers/power/gpio-charger.c new file +7
-0+ +struct power_supply charger; +}; + +static irqreturn_t gpio_charger_irq (int irq,void *devid) +{ +struct power_supply *charger = devid;Please add an empty line here.
drivers/power/gpio-charger.c
Quoted 6 lines
drivers/power/gpio-charger.c new file +6
-0+power_supply_changed (charger); + +return IRQ_HANDLED ; +} + +static inline struct gpio_charger *psy_to_gpio_charger(struct
power_supply*psy)drivers/power/gpio-charger.c line 49
Quoted 6 lines
drivers/power/gpio-charger.c new file +6
-0+{ + return container_of(psy, struct gpio_charger, charger); +} + +static int gpio_charger_get_property (struct power_supply *psy, +enum power_supply_property psp,union power_supply_propval *val)One more tab for here?
Quoted 53 lines
drivers/power/gpio-charger.c new file +23
-0+{ +struct gpio_charger *gpio_charger =psy_to_gpio_charger (psy); +const struct gpio_charger_platform_data *pdata = gpio_charger->pdata; + +switch (psp) { +case POWER_SUPPLY_PROP_ONLINE : + val->intval =gpio_get_value (pdata->gpio); + val->intval ^= pdata->gpio_active_low; +break ; +default : +return -EINVAL ; + } + +return 0 ; +} + +static enum power_supply_property gpio_charger_properties[] = { +POWER_SUPPLY_PROP_ONLINE , +}; + +static int __devinit gpio_charger_probe (struct platform_device *pdev) +{ + const struct gpio_charger_platform_data *pdata = pdev-dev.platform_data;
drivers/power/gpio-charger.c new file +29
-0+struct gpio_charger *gpio_charger; +struct power_supply *charger; +int ret; + +if (!pdata) { +dev_err (&pdev->dev,"No platform data" ); +return -EINVAL ; + } + +if (!gpio_is_valid (pdata->gpio)) { +dev_err (&pdev->dev,"Invalid gpio pin\n" ); +return -EINVAL ; + } + + gpio_charger =kzalloc (sizeof (*gpio_charger),GFP_KERNEL ); + + charger = &gpio_charger->charger; + + charger->name = pdata->name; + charger->type = pdata->type; + charger->properties = gpio_charger_properties; + charger->num_properties =ARRAY_SIZE (gpio_charger_properties); + charger->get_property = gpio_charger_get_property; + charger->supplied_to = pdata->supplied_to; + charger->num_supplicants = pdata->num_supplicants; + + ret =gpio_request (pdata->gpio,dev_name (&pdev->dev)); +if (ret) { +dev_err (&pdev->dev,"Failed to request gpio pin: %d\n" , ret);drivers/power/gpio-charger.c line 111
Quoted 10 lines
drivers/power/gpio-charger.c new file +10
-0+ goto err_free; + } + ret =gpio_direction_input (pdata->gpio); +if (ret) { +dev_err (&pdev->dev,"Failed to set gpio to input: %d\n" , ret); + goto err_gpio_free; + } + + gpio_charger->irq =gpio_to_irq (pdata->gpio); +if (gpio_charger->irq >=0 ) {0 isn't valid IRQ number. The check should be just 'if (gpio_charger-
drivers/power/gpio-charger.c
Quoted 7 lines
irq)'.
drivers/power/gpio-charger.c new file +5
-0+ ret =request_irq (gpio_charger->irq, gpio_charger_irq, +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , +dev_name (&pdev->dev), charger); +if (ret) { + dev_warn(&pdev->dev, "Failed to request gpio irq: %d\n",ret);
drivers/power/gpio-charger.c
Quoted 9 lines
drivers/power/gpio-charger.c new file +9
-0+ gpio_charger->irq =-1 ; + } + } + + gpio_charger->pdata = pdata; + + ret =power_supply_register (&pdev->dev, charger); +if (ret <0 ) { + dev_err(&pdev->dev, "Failed to register power supply: %d\n",ret);
Quoted 47 lines
drivers/power/gpio-charger.c new file +47
-0+ goto err_irq_free; + } + +platform_set_drvdata (pdev, gpio_charger); + +return 0 ; + +err_irq_free: +if (gpio_charger->irq >=0 ) +free_irq (gpio_charger->irq, charger); +err_gpio_free: +gpio_free (pdata->gpio); +err_free: +kfree (gpio_charger); +return ret; +} + +static int __devexit gpio_charger_remove(struct platform_device *pdev) +{ +struct gpio_charger *gpio_charger =platform_get_drvdata (pdev); +const struct gpio_charger_platform_data *pdata = gpio_charger->pdata; + +power_supply_unregister (&gpio_charger->charger); + +if (gpio_charger->irq >=0 ) +free_irq (gpio_charger->irq, &gpio_charger->charger); +gpio_free (pdata->gpio); + +platform_set_drvdata (pdev,NULL ); +kfree (gpio_charger); + +return 0 ; +} + +static struct platform_driver gpio_charger_driver = { + .probe = gpio_charger_probe, + .remove =__devexit_p (gpio_charger_remove), + .driver = { + .name ="gpio-charger" , + .owner =THIS_MODULE , + }, +}; + +static int __init gpio_charger_init (void ) +{ +return platform_driver_register (&gpio_charger_driver); +}drivers/power/gpio-charger.c
Quoted 10 lines
drivers/power/gpio-charger.c new file +10
-0+module_init (gpio_charger_init); + +static void __exit gpio_charger_exit(void) +{ +platform_driver_unregister (&gpio_charger_driver); +} +module_exit (gpio_charger_exit); + +MODULE_AUTHOR ("Lars-Peter Clausen <[email protected]>" ); +MODULE_DESCRIPTION("Driver for chargers which report their online statusthrough a GPIO");
Review
Quoted 3 lines
drivers/power/gpio-charger.c new file +2
-0+MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:gpio-charger" );(quoted diff) +0
-0
b/include/linux/power/gpio-charger.hinclude/linux/power/gpio-charger.h line 4
Quoted 9 lines
new file mode 100644
index 0000000..404d5e6include/linux/power/gpio-charger.h new file +4
-0@@ -0,0 +1,39 @@ +/* +* Copyright (C) 2010, Lars-Peter Clausen <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it
include/linux/power/gpio-charger.h line 5
Quoted 1 line
include/linux/power/gpio-charger.h new file +1
-0+* under the terms of the GNU General Public License as published by the
include/linux/power/gpio-charger.h line 6
Quoted 1 line
include/linux/power/gpio-charger.h new file +1
-0+* Free Software Foundation; either version 2 of the License, or (at your
include/linux/power/gpio-charger.h line 9
Quoted 3 lines
include/linux/power/gpio-charger.h new file +3
-0+* option) any later version. +* +* You should have received a copy of the GNU General Public License along
include/linux/power/gpio-charger.h line 10
Quoted 1 line
include/linux/power/gpio-charger.h new file +1
-0+* with this program; if not, write to the Free Software Foundation, Inc.,
include/linux/power/gpio-charger.h line 18
Quoted 8 lines
include/linux/power/gpio-charger.h new file +8
-0+* 675 Mass Ave, Cambridge, MA 02139, USA. +* +*/ + +#ifndef __LINUX_POWER_GPIO_CHARGER_H__ +#define __LINUX_POWER_GPIO_CHARGER_H__ + +/* Should be /**
include/linux/power/gpio-charger.h line 19
Quoted 1 line
include/linux/power/gpio-charger.h new file +1
-0+* struct gpio_charger_platform_data - platform_data for gpio_charger devices
include/linux/power/gpio-charger.h
Quoted 4 lines
include/linux/power/gpio-charger.h new file +4
-0+* @name: Name for the chargers power_supply device +* @type: Type of the charger +* @gpio: GPIO which is used to indicate the chargers status +* @gpio_active_low: Should be set to 1 if the GPIO is active low otherwise 0
include/linux/power/gpio-charger.h line 24
Quoted 1 line
include/linux/power/gpio-charger.h new file +1
-0+* @supplied_to: Array of battery names to which this chargers supplies power
include/linux/power/gpio-charger.h line 27
Quoted 3 lines
include/linux/power/gpio-charger.h new file +3
-0+* @num_supplicants: Number of entries in the supplied_to array +*/ +No need for this empty line.
include/linux/power/gpio-charger.h line 30
Quoted 3 lines
include/linux/power/gpio-charger.h new file +3
-0+struct gpio_charger_platform_data { +const char *name; +enum power_supply_type type;#include <
linux/power_supply.h> is needed for this.include/linux/power/gpio-charger.h line 36
Quoted 6 lines
include/linux/power/gpio-charger.h new file +6
-0+ +int gpio; +int gpio_active_low; + +char **supplied_to; +size_t num_supplicants;And #include <
linux/types.h> for this.include/linux/power/gpio-charger.h line 39
Quoted 3 lines
include/linux/power/gpio-charger.h new file +3
-0+}; + +#endif Thanks!
Quoted 4 lines
--
Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
PATCH v2 1/1 POWER: Add gpio charger driver
In reply to Lars-Peter ClausenThis patch adds a simple driver for chargers indicating their online status through a GPIO pin.
---
Changes since v1
* Fix typo in Kconfig
* Fix whitespace issues
* Add missing includes in the header file
* Make the irq field of the driver struct unsigned and assume that 0 is not a valid irq.
--- drivers/power/Kconfig | 10 ++ drivers/power/Makefile | 1 + drivers/power/gpio-charger.c | 185 ++++++++++++++++++++++++++++++++++++ include/linux/power/gpio-charger.h | 41 ++++++++ 4 files changed, 237 insertions(+), 0 deletions(-) create mode 100644 drivers/power/gpio-charger.c create mode 100644 include/linux/power/gpio-charger.h
drivers/power/Kconfig +10 -0
@@ -166,4 +166,14 @@ config BATTERY_INTEL_MID Say Y here to enable the battery driver on Intel MID platforms. +config CHARGER_GPIO + tristate "GPIO charger" + depends on GPIOLIB + help + Say Y to include support for chargers which report their online status + through a GPIO pin. + + This driver can be build as a module. If so, the module will be + called gpio-charger. + endif # POWER_SUPPLY
drivers/power/Makefile +1 -0
@@ -37,3 +37,4 @@ obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o +obj-$(CONFIG_CHARGER_GPIO) += gpio-charger.o
drivers/power/gpio-charger.c new file +185 -0
185 lines not on this page · raw message
include/linux/power/gpio-charger.h new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
1.5.6.5
Re: [PATCH v2] POWER: Add gpio charger driver
drivers/power/gpio-charger.c line 118
Quoted 7 lines · Lars-Peter Clausen
drivers/power/gpio-charger.c new file +7
-0+ irq =gpio_to_irq (pdata->gpio); +if (irq >0 ) { + ret =request_irq (irq, gpio_charger_irq, +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , +dev_name (&pdev->dev), charger); +if (ret) +dev_warn (&pdev->dev,"Failed to request irq: %d\n" , ret);
It would be good to handle IRQs that can sleep (like those on I2C GPIO expanders) here - either always use a threaded IRQ handler (probably won't hurt here) or use one if the IRQ can sleep.
Re: [PATCH v2] POWER: Add gpio charger driver
Quoted 13 lines · Mark Brown
drivers/power/gpio-charger.c line 118
Quoted 7 lines · Lars-Peter Clausen
drivers/power/gpio-charger.c new file +7
-0+ irq =gpio_to_irq (pdata->gpio); +if (irq >0 ) { + ret =request_irq (irq, gpio_charger_irq, +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , +dev_name (&pdev->dev), charger); +if (ret) +dev_warn (&pdev->dev,"Failed to request irq: %d\n" , ret);It would be good to handle IRQs that can sleep (like those on I2C GPIO expanders) here - either always use a threaded IRQ handler (probably won't hurt here) or use one if the IRQ can sleep.
I guess the best would be to use request_any_context_irq, right?
- Lars
Re: [PATCH v2] POWER: Add gpio charger driver
Quoted 6 lines · Lars-Peter Clausen
Quoted 3 lines · Mark Brown
It would be good to handle IRQs that can sleep (like those on I2C GPIO expanders) here - either always use a threaded IRQ handler (probably won't hurt here) or use one if the IRQ can sleep.
I guess the best would be to use
request_any_context_irq, right?
Ah, that got merged now - yes, that'd be best.
Re: [PATCH v2] POWER: Add gpio charger driver
In reply to Lars-Peter ClausenQuoted 4 lines · Lars-Peter Clausen
This patch adds a simple driver for chargers indicating their online status through a GPIO pin.
Signed-off-by Lars-Peter Clausen <[email protected]>
Hm. I'm getting older, it seems. Now can anybody remind me why pda_power.c doesn't work here? ;-)
This driver looks like a light-weigh version of pda_power, except that it can do GPIOs directly (instead of is_*_online() callbacks).
Can we instead improve pda_power? Like this:
if (!pdata->is_ac_online && pdata->ac_monitor_gpio) pdata->is_ac_online = pda_ac_monitor_gpio;
Should look quite cool, I think.
(Plus, we might get rid of ac/usb stuff in that driver, and pass enum power_supply_type to the callbacks instead).
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2
Re: [PATCH v2] POWER: Add gpio charger driver
Quoted 14 lines · Anton Vorontsov
Quoted 4 lines · Lars-Peter Clausen
This patch adds a simple driver for chargers indicating their online status through a GPIO pin.
Signed-off-by Lars-Peter Clausen <[email protected]>Hm. I'm getting older, it seems. Now can anybody remind me why
pda_power.cdoesn't work here? ;-)This driver looks like a light-weigh version of
pda_power, except that it can do GPIOs directly (instead of is_*_online() callbacks).Can we instead improve
pda_power? Like this:
Quoted 8 lines
if (!pdata->is_ac_online && pdata->ac_monitor_gpio) pdata->is_ac_online = pda_ac_monitor_gpio;Should look quite cool, I think.
(Plus, we might get rid of ac/usb stuff in that driver, and pass enum
power_supply_typeto the callbacks instead).
Hi
Hm... I guess it can be, but on the other hand most platform bus chargers type devices can be, because the pda_power driver is keep pretty generic with custom init, status and exit callbacks.
- Lars
RE: [PATCH v2] POWER: Add gpio charger driver
Quoted 35 lines
-----Original Message-----
From: Lars-Peter Clausen [mailto:[email protected]]
Sent: Thursday, October 21, 2010 10:48 AM
To: Anton Vorontsov
Cc: Rhyland Klein; [email protected]; Andrew Chew; [email protected]; [email protected]
Subject: Re: [PATCH v2] POWER: Add gpio charger driverQuoted 2 lines · Anton Vorontsov
Quoted 1 line · Lars-Peter Clausen
This patch adds a simple driver for chargers indicating their online
status
Quoted 12 lines
Quoted 3 lines
through a GPIO pin.
Signed-off-by Lars-Peter Clausen <[email protected]>Hm. I'm getting older, it seems. Now can anybody remind me why
pda_power.cdoesn't work here? ;-)This driver looks like a light-weigh version of
pda_power, except that it can do GPIOs directly (instead of is_*_online() callbacks).Can we instead improve
pda_power? Like this:Quoted 8 lines
if (!pdata->is_ac_online && pdata->ac_monitor_gpio) pdata->is_ac_online = pda_ac_monitor_gpio;Should look quite cool, I think.
(Plus, we might get rid of ac/usb stuff in that driver, and pass enum
power_supply_typeto the callbacks instead).Hi
Quoted 7 lines
Hm... I guess it can be, but on the other hand most platform bus chargers type
devices can be, because thepda_powerdriver is keep pretty generic with custom init,
status and exit callbacks.- Lars
Not sure what the state of this driver is, but I figured I would let you know that I tested The driver on my platform and it does indeed work in place of my driver. So I am happy with this one :)
-rhyland ���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
RE: [PATCH v2] POWER: Add gpio charger driver
In reply to Lars-Peter ClausenQuoted 35 lines
-----Original Message-----
From: Lars-Peter Clausen [mailto:[email protected]]
Sent: Thursday, October 21, 2010 10:48 AM
To: Anton Vorontsov
Cc: Rhyland Klein; [email protected]; Andrew Chew; [email protected]; [email protected]
Subject: Re: [PATCH v2] POWER: Add gpio charger driverQuoted 2 lines · Anton Vorontsov
Quoted 1 line · Lars-Peter Clausen
This patch adds a simple driver for chargers indicating their online
status
Quoted 12 lines
Quoted 3 lines
through a GPIO pin.
Signed-off-by Lars-Peter Clausen <[email protected]>Hm. I'm getting older, it seems. Now can anybody remind me why
pda_power.cdoesn't work here? ;-)This driver looks like a light-weigh version of
pda_power, except that it can do GPIOs directly (instead of is_*_online() callbacks).Can we instead improve
pda_power? Like this:Quoted 8 lines
if (!pdata->is_ac_online && pdata->ac_monitor_gpio) pdata->is_ac_online = pda_ac_monitor_gpio;Should look quite cool, I think.
(Plus, we might get rid of ac/usb stuff in that driver, and pass enum
power_supply_typeto the callbacks instead).Hi
Quoted 7 lines
Hm... I guess it can be, but on the other hand most platform bus chargers type
devices can be, because thepda_powerdriver is keep pretty generic with custom init,
status and exit callbacks.- Lars
I didn't see any more discussion on this. Is the plan to integrate the gpio-charger driver as is or to instead try to integrate support for this into pda_power?
-rhyland ���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
Re: [PATCH v2] POWER: Add gpio charger driver
On Thu, Oct 28, 2010 at 02:17:41PM -0700, Rhyland Klein wrote:
[...]
Quoted 11 lines
Quoted 7 lines
Hm... I guess it can be, but on the other hand most platform bus chargers type
devices can be, because thepda_powerdriver is keep pretty generic with custom init,
status and exit callbacks.- Lars
I didn't see any more discussion on this. Is the plan to integrate the gpio-charger driver as is or to instead try to integrate support for this into
pda_power?
Sorry for the delayed response, and thanks for the pings! ;-)
The main thing I'm afraid of is duplication. I.e. someday you will want debouncing (include/linux/pda_power.h's wait_for_status, wait_for_charger parameters) support, regulators support etc.
And your gpio driver will look very similar to pda_power.
So I'd vote for adding the GPIO functionality to pda_power, and refactoring it if needed.
Though, if there are strong objections against this idea, I can merge the GPIO driver, and let's see how things will evolve.
Thanks!
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2
RE: [PATCH v2] POWER: Add gpio charger driver
Quoted 37 lines
From: Anton Vorontsov [mailto:[email protected]]
Sent: Thursday, November 04, 2010 10:48 AM
To: Rhyland Klein
Cc: Lars-Peter Clausen; [email protected]; Andrew Chew; [email protected]; [email protected]
Subject: Re: [PATCH v2] POWER: Add gpio charger driverOn Thu, Oct 28, 2010 at 02:17:41PM -0700, Rhyland Klein wrote:
[...]Quoted 1 line
Quoted 1 line
Hm... I guess it can be, but on the other hand most platform bus
chargers
Quoted 2 lines
Quoted 2 lines
type
devices can be, because thepda_powerdriver is keep pretty genericwith
Quoted 8 lines
Quoted 4 lines
custom init,
status and exit callbacks.- Lars
I didn't see any more discussion on this. Is the plan to integrate the gpio-charger driver as is or to instead try to integrate support for this into
pda_power?Sorry for the delayed response, and thanks for the pings! ;-)
The main thing I'm afraid of is duplication. I.e. someday you will want debouncing (include/linux/pda_power.h's
wait_for_status,wait_for_chargerparameters) support, regulators support etc.And your gpio driver will look very similar to
pda_power.So I'd vote for adding the GPIO functionality to
pda_power, and refactoring it if needed.Though, if there are strong objections against this idea, I can merge the GPIO driver, and let's see how things will evolve.
Quoted 6 lines
Thanks!
--
Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2
My guess, is that since no one has responded, no one is working on integrating the functionality into pda-power?
-rhyland ���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
Re: [PATCH v2] POWER: Add gpio charger driver
Quoted 37 lines · Rhyland Klein
Quoted 37 lines
From: Anton Vorontsov [mailto:[email protected]]
Sent: Thursday, November 04, 2010 10:48 AM
To: Rhyland Klein
Cc: Lars-Peter Clausen; [email protected]; Andrew Chew; [email protected]; [email protected]
Subject: Re: [PATCH v2] POWER: Add gpio charger driverOn Thu, Oct 28, 2010 at 02:17:41PM -0700, Rhyland Klein wrote:
[...]Quoted 1 line
Quoted 1 line
Hm... I guess it can be, but on the other hand most platform bus
chargers
Quoted 2 lines
Quoted 2 lines
type
devices can be, because thepda_powerdriver is keep pretty genericwith
Quoted 7 lines
Quoted 4 lines
custom init,
status and exit callbacks.- Lars
I didn't see any more discussion on this. Is the plan to integrate the gpio-charger driver as is or to instead try to integrate support for this into
pda_power?Sorry for the delayed response, and thanks for the pings! ;-)
The main thing I'm afraid of is duplication. I.e. someday you will want debouncing (include/linux/pda_power.h's
wait_for_status,wait_for_chargerparameters) support, regulators support etc.And your gpio driver will look very similar to
pda_power.So I'd vote for adding the GPIO functionality to
pda_power, and refactoring it if needed.Though, if there are strong objections against this idea, I can merge the GPIO driver, and let's see how things will evolve.
Thanks!
Quoted 8 lines
Quoted 4 lines
--
Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2My guess, is that since no one has responded, no one is working on integrating the functionality into pda-power?
-rhyland
hi
Well I'm still not convinced that both drivers should be merged, yet I'm not totally opposed to it. In my opinion we are in some kind of dilemma here.
I can see Antons point regarding to introducing code duplication, but on the other hand you'll always have code duplication amongst similar drivers. This will especially stand out if the setup functions take up a relatively large part of the whole code size.
One way to avoid this is by putting everything into one driver which handles all different cases. But the next time yet another sort of similar driver comes along another if-else-branch is added to the pda-power driver. And slowly over time things will get messy.
Another option to solve the problem is to add another level of indirection. For example in form of a simple_charger driver which will take callbacks for add, remove and status. The gpio-charger and pda-power could then instantiate such a driver and provide their callbacks. But by adding more and more levels of indirection things will slowly get messy as well.
One solution that might could work is to provide library functions which aim at providing aid for implementing (simple) charger drivers.
- Lars
RE: [PATCH v2] POWER: Add gpio charger driver
Quoted 87 lines
From: Lars-Peter Clausen [mailto:[email protected]]
Sent: Wednesday, November 10, 2010 5:34 PM
To: Rhyland Klein
Cc: Anton Vorontsov; [email protected]; Andrew Chew; [email protected]; [email protected]
Subject: Re: [PATCH v2] POWER: Add gpio charger driverQuoted 4 lines · Rhyland Klein
Quoted 4 lines
From: Anton Vorontsov [mailto:[email protected]]
Sent: Thursday, November 04, 2010 10:48 AM
To: Rhyland Klein
Cc: Lars-Peter Clausen; [email protected]; AndrewChew;
Quoted 31 lines
Quoted 31 lines
[email protected]; [email protected]
Subject: Re: [PATCH v2] POWER: Add gpio charger driverOn Thu, Oct 28, 2010 at 02:17:41PM -0700, Rhyland Klein wrote:
[...]Quoted 1 line
Quoted 1 line
Hm... I guess it can be, but on the other hand most platform bus
chargers
Quoted 2 lines
Quoted 2 lines
type
devices can be, because thepda_powerdriver is keep pretty genericwith
Quoted 7 lines
Quoted 4 lines
custom init,
status and exit callbacks.- Lars
I didn't see any more discussion on this. Is the plan to integrate the gpio-charger driver as is or to instead try to integrate support for this into
pda_power?Sorry for the delayed response, and thanks for the pings! ;-)
The main thing I'm afraid of is duplication. I.e. someday you will want debouncing (include/linux/pda_power.h's
wait_for_status,wait_for_chargerparameters) support, regulators support etc.And your gpio driver will look very similar to
pda_power.So I'd vote for adding the GPIO functionality to
pda_power, and refactoring it if needed.Though, if there are strong objections against this idea, I can merge the GPIO driver, and let's see how things will evolve.
Quoted 8 lines
Quoted 6 lines
Thanks!
--
Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2My guess, is that since no one has responded, no one is working on
integrating the functionality into pda-power?
Quoted 2 lines
-rhyland
hi
Well I'm still not convinced that both drivers should be merged, yet I'm not totally
opposed to it. In my opinion we are in some kind of dilemma here. I can see Antons point regarding to introducing code duplication, but on the other
hand you'll always have code duplication amongst similar drivers. This will especially stand out if the setup functions take up a relatively large part of the
whole code size.
One way to avoid this is by putting everything into one driver which handles all
different cases. But the next time yet another sort of similar driver comes along
another if-else-branch is added to the pda-power driver. And slowly over time things
will get messy.
Another option to solve the problem is to add another level of indirection. For
example in form of asimple_chargerdriver which will take callbacks for add, remove
and status. The gpio-charger and pda-power could then instantiate such a driver and
provide their callbacks. But by adding more and more levels of indirection things
will slowly get messy as well.
One solution that might could work is to provide library functions which aim at
providing aid for implementing (simple) charger drivers.
Quoted 1 line
- Lars
Well, this is how I look at it. For now, we can integrate the generic gpio-charger driver. Then there are 2 concerns. If someone wants a gpio-charger with more functionality that duplicates what pda-power does, then maybe the correct thing to do is to make a new driver instead of trying to extend gpio-charger. Also, if we put in the gpio-charger now, we can still work to integrate that functionality into pda-power, and then deprecate gpio-charger.
-rhyland ���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
RE: [PATCH v2] POWER: Add gpio charger driver
In reply to Lars-Peter ClausenQuoted 80 lines
Quoted 4 lines · Rhyland Klein
Quoted 4 lines
From: Anton Vorontsov [mailto:[email protected]]
Sent: Thursday, November 04, 2010 10:48 AM
To: Rhyland Klein
Cc: Lars-Peter Clausen; [email protected]; AndrewChew;
Quoted 31 lines
Quoted 31 lines
[email protected]; [email protected]
Subject: Re: [PATCH v2] POWER: Add gpio charger driverOn Thu, Oct 28, 2010 at 02:17:41PM -0700, Rhyland Klein wrote:
[...]Quoted 1 line
Quoted 1 line
Hm... I guess it can be, but on the other hand most platform bus
chargers
Quoted 2 lines
Quoted 2 lines
type
devices can be, because thepda_powerdriver is keep pretty genericwith
Quoted 7 lines
Quoted 4 lines
custom init,
status and exit callbacks.- Lars
I didn't see any more discussion on this. Is the plan to integrate the gpio-charger driver as is or to instead try to integrate support for this into
pda_power?Sorry for the delayed response, and thanks for the pings! ;-)
The main thing I'm afraid of is duplication. I.e. someday you will want debouncing (include/linux/pda_power.h's
wait_for_status,wait_for_chargerparameters) support, regulators support etc.And your gpio driver will look very similar to
pda_power.So I'd vote for adding the GPIO functionality to
pda_power, and refactoring it if needed.Though, if there are strong objections against this idea, I can merge the GPIO driver, and let's see how things will evolve.
Quoted 8 lines
Quoted 6 lines
Thanks!
--
Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2My guess, is that since no one has responded, no one is working on
integrating the functionality into pda-power?
Quoted 2 lines
-rhyland
hi
Well I'm still not convinced that both drivers should be merged, yet I'm not totally
opposed to it. In my opinion we are in some kind of dilemma here. I can see Antons point regarding to introducing code duplication, but on the other
hand you'll always have code duplication amongst similar drivers. This will especially stand out if the setup functions take up a relatively large part of the
whole code size.
One way to avoid this is by putting everything into one driver which handles all
different cases. But the next time yet another sort of similar driver comes along
another if-else-branch is added to the pda-power driver. And slowly over time things
will get messy.
Another option to solve the problem is to add another level of indirection. For
example in form of asimple_chargerdriver which will take callbacks for add, remove
and status. The gpio-charger and pda-power could then instantiate such a driver and
provide their callbacks. But by adding more and more levels of indirection things
will slowly get messy as well.
One solution that might could work is to provide library functions which aim at
providing aid for implementing (simple) charger drivers.
Quoted 1 line
- Lars
Anton, for the time being, can we integrate this driver? That way the functionality is there and can be used now?
-rhyland ���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
Anton Vorontsov
AppliedRe: [PATCH v2] POWER: Add gpio charger driver
In reply to Lars-Peter ClausenQuoted 5 lines · Lars-Peter Clausen
This patch adds a simple driver for chargers indicating their online status through a GPIO pin.
Signed-off-by Lars-Peter Clausen <[email protected]>
Quoted 7 lines
---
Changes since v1
* Fix typo inKconfig
* Fix whitespace issues
* Add missing includes in the header file
* Make the irq field of the driver struct unsigned and assume that 0 is not a valid irq.
Applied, thanks!
But please, look at Mark Brown comments. If they are still applicable, the follow up patch would be great.
Thanks!
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2
Re: [PATCH v2] POWER: Add gpio charger driver
Quoted 14 lines · Anton Vorontsov
Quoted 5 lines · Lars-Peter Clausen
This patch adds a simple driver for chargers indicating their online status through a GPIO pin.
Signed-off-by Lars-Peter Clausen <[email protected]>Quoted 7 lines
---
Changes since v1
* Fix typo inKconfig
* Fix whitespace issues
* Add missing includes in the header file
* Make the irq field of the driver struct unsigned and assume that 0 is not a valid irq.
Quoted 7 lines
Applied, thanks!
But please, look at Mark Brown comments. If they are still applicable, the follow up patch would be great.
Thanks!
Hi
I'll send a follow up patch later today. I think I had one or two other issues on my list that need to be addressed.
I wanted to wait with v3 until it was clear whether the driver had a chance to be merged at all.
Do you prefer a v3 of the original patch or an incremental one?
- Lars
Re: [PATCH v2] POWER: Add gpio charger driver
On Thu, Nov 18, 2010 at 03:30:09PM +0100, Lars-Peter Clausen wrote:
[..]
Quoted 10 lines
Quoted 2 lines
But please, look at Mark Brown comments. If they are still applicable, the follow up patch would be great.
Hi
I'll send a follow up patch later today. I think I had one or two other issues on my list that need to be addressed.
I wanted to wait with v3 until it was clear whether the driver had a chance to be merged at all.
Do you prefer a v3 of the original patch or an incremental one?
Incremental would be fine, thanks!
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2