diff options
author | lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-05-12 23:12:41 +0000 |
---|---|---|
committer | lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-05-12 23:12:41 +0000 |
commit | 29ec26ff1bdcb281b6331f4a88b3813fb8ed0c75 (patch) | |
tree | 402c05359e50ec9e57f35311ae676c231145df39 /target/linux/xburst/patches-2.6.34/106-gpio-charger.patch | |
parent | 8f059e046aa981835622446c16530981d5a14909 (diff) |
[xburst] Add 2.6.34 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21438 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/xburst/patches-2.6.34/106-gpio-charger.patch')
-rw-r--r-- | target/linux/xburst/patches-2.6.34/106-gpio-charger.patch | 266 |
1 files changed, 266 insertions, 0 deletions
diff --git a/target/linux/xburst/patches-2.6.34/106-gpio-charger.patch b/target/linux/xburst/patches-2.6.34/106-gpio-charger.patch new file mode 100644 index 0000000000..f134958f53 --- /dev/null +++ b/target/linux/xburst/patches-2.6.34/106-gpio-charger.patch @@ -0,0 +1,266 @@ +From fc2a5da7117de38ddb538fb7c9907ec1aeb386ba Mon Sep 17 00:00:00 2001 +From: Lars-Peter Clausen <lars@metafoo.de> +Date: Sat, 24 Apr 2010 12:29:31 +0200 +Subject: [PATCH] Add gpio chager driver + +--- + drivers/power/Kconfig | 7 ++ + drivers/power/Makefile | 1 + + drivers/power/gpio-charger.c | 184 ++++++++++++++++++++++++++++++++++++ + include/linux/power/gpio-charger.h | 28 ++++++ + 4 files changed, 220 insertions(+), 0 deletions(-) + create mode 100644 drivers/power/gpio-charger.c + create mode 100644 include/linux/power/gpio-charger.h + +diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig +index 2f4e51f..81d13b8 100644 +--- a/drivers/power/Kconfig ++++ b/drivers/power/Kconfig +@@ -142,4 +142,11 @@ config BATTERY_JZ4740 + This driver can be build as a module. If so, the module will be + called jz4740-battery. + ++config CHARGER_GPIO ++ tristate "GPIO charger" ++ depends on GPIOLIB ++ help ++ Say Y to include support for chargers indicating their status through ++ a GPIO pin. ++ + endif # POWER_SUPPLY +diff --git a/drivers/power/Makefile b/drivers/power/Makefile +index 3b6b971..8deb992 100644 +--- a/drivers/power/Makefile ++++ b/drivers/power/Makefile +@@ -33,3 +33,4 @@ obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o + obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o + obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o + obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o ++obj-$(CONFIG_CHARGER_GPIO) += gpio-charger.o +diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c +new file mode 100644 +index 0000000..7a84994 +--- /dev/null ++++ b/drivers/power/gpio-charger.c +@@ -0,0 +1,184 @@ ++/* ++ * Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de> ++ * Driver for chargers indicating their status through a GPIO pin ++ * ++ * 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. ++ * ++ */ ++ ++#include <linux/device.h> ++#include <linux/gpio.h> ++#include <linux/init.h> ++#include <linux/interrupt.h> ++#include <linux/kernel.h> ++#include <linux/module.h> ++#include <linux/platform_device.h> ++#include <linux/power_supply.h> ++#include <linux/slab.h> ++#include <linux/types.h> ++ ++#include <linux/power/gpio-charger.h> ++ ++struct gpio_charger { ++ const struct gpio_charger_platform_data *pdata; ++ ++ int irq; ++ ++ struct power_supply charger; ++}; ++ ++static irqreturn_t gpio_charger_irq(int irq, void *devid) ++{ ++ struct power_supply *charger = devid; ++ 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) ++{ ++ 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; ++ } ++ ++ 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->batteries; ++ charger->num_supplicants = pdata->num_batteries; ++ ++ if (gpio_is_valid(pdata->gpio)) { ++ 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; ++ } ++ 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) { ++ 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 online gpio irq: %d\n", ret); ++ gpio_charger->irq = -1; ++ } ++ } ++ } ++ ++ ret = power_supply_register(&pdev->dev, charger); ++ if (ret < 0) { ++ dev_err(&pdev->dev, "Failed to register power supply: %d\n", ret); ++ goto err_gpio_free; ++ } ++ ++ gpio_charger->pdata = pdata; ++ platform_set_drvdata(pdev, gpio_charger); ++ ++ return 0; ++ ++err_gpio_free: ++ if (gpio_is_valid(pdata->gpio)) { ++ if (gpio_charger->irq >= 0) ++ free_irq(gpio_charger->irq, charger); ++ gpio_free(pdata->gpio); ++ } ++err: ++ 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_is_valid(pdata->gpio)) { ++ 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 <lars@metafoo.de>"); ++MODULE_DESCRIPTION("Driver for chargers indicating their status through a gpio"); ++MODULE_LICENSE("GPL"); ++MODULE_ALIAS("platform:gpio-charger"); +diff --git a/include/linux/power/gpio-charger.h b/include/linux/power/gpio-charger.h +new file mode 100644 +index 0000000..95cdfc3 +--- /dev/null ++++ b/include/linux/power/gpio-charger.h +@@ -0,0 +1,28 @@ ++/* ++ * Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de> ++ * ++ * 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 { ++ const char *name; ++ enum power_supply_type type; ++ int gpio; ++ int gpio_active_low; ++ ++ char **batteries; ++ size_t num_batteries; ++}; ++ ++#endif +-- +1.5.6.5 + |