From: Pali Rohár Date: Sun, 9 Oct 2011 15:12:24 +0000 (+0200) Subject: Update bq27x00_battery driver, use only one upstream patch bq27x00-upstream.diff... X-Git-Tag: kernel-power-settings-0.13~5 X-Git-Url: http://git.maemo.org/git/?p=kernel-power;a=commitdiff_plain;h=f4b746ed93aa4ff71bb8167dea853a374b394c47 Update bq27x00_battery driver, use only one upstream patch bq27x00-upstream.diff and one maemo patch bq27x00-maemo.diff --- diff --git a/kernel-power-2.6.28/debian/patches/bq27x00-maemo.diff b/kernel-power-2.6.28/debian/patches/bq27x00-maemo.diff index 5d6f5dc..4e6625c 100644 --- a/kernel-power-2.6.28/debian/patches/bq27x00-maemo.diff +++ b/kernel-power-2.6.28/debian/patches/bq27x00-maemo.diff @@ -1,8 +1,8 @@ ---- kernel-power-2.6.28/drivers/power/bq27x00_battery.c 2011-09-21 13:16:45.007978008 +0200 -+++ kernel-power-2.6.28/drivers/power/bq27x00_battery.c 2011-09-21 13:49:06.207956191 +0200 -@@ -36,7 +36,12 @@ - #include +--- kernel-power-2.6.28/drivers/power/bq27x00_battery.c 2011-10-09 17:23:49.655669727 +0200 ++++ kernel-power-2.6.28/drivers/power/bq27x00_battery.c 2011-10-09 17:24:58.823667413 +0200 +@@ -39,7 +39,20 @@ #include + #include -#include +#define CONFIG_BATTERY_BQ27X00_I2C @@ -11,10 +11,18 @@ + const char *name; + int (*read)(struct device *dev, unsigned int); +}; ++ ++#define BQ27X00_READ_REG _IO(MISC_MAJOR, 0) ++ ++struct bq27x00_reg_parms { ++ int reg; ++ int single; ++ int ret; ++}; #define DRIVER_VERSION "1.2.0" -@@ -113,7 +118,9 @@ static enum power_supply_property bq27x0 +@@ -123,7 +136,9 @@ static enum power_supply_property bq27x0 POWER_SUPPLY_PROP_VOLTAGE_NOW, POWER_SUPPLY_PROP_CURRENT_NOW, POWER_SUPPLY_PROP_CAPACITY, @@ -24,7 +32,7 @@ POWER_SUPPLY_PROP_TEMP, POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW, POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG, -@@ -122,8 +129,10 @@ static enum power_supply_property bq27x0 +@@ -132,8 +147,10 @@ static enum power_supply_property bq27x0 POWER_SUPPLY_PROP_CHARGE_FULL, POWER_SUPPLY_PROP_CHARGE_NOW, POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, @@ -35,7 +43,7 @@ }; static unsigned int poll_interval = 360; -@@ -353,7 +362,9 @@ static void bq27x00_battery_poll(struct +@@ -370,7 +387,9 @@ static void bq27x00_battery_poll(struct if (poll_interval > 0) { /* The timer does not have to be accurate. */ @@ -45,7 +53,7 @@ schedule_delayed_work(&di->work, poll_interval * HZ); } } -@@ -423,6 +434,7 @@ static int bq27x00_battery_status(struct +@@ -440,6 +459,7 @@ static int bq27x00_battery_status(struct return 0; } @@ -53,7 +61,7 @@ static int bq27x00_battery_capacity_level(struct bq27x00_device_info *di, union power_supply_propval *val) { -@@ -452,6 +464,7 @@ static int bq27x00_battery_capacity_leve +@@ -469,6 +489,7 @@ static int bq27x00_battery_capacity_leve return 0; } @@ -61,7 +69,7 @@ /* * Return the battery Voltage in milivolts -@@ -520,9 +533,11 @@ static int bq27x00_battery_get_property( +@@ -537,9 +558,11 @@ static int bq27x00_battery_get_property( case POWER_SUPPLY_PROP_CAPACITY: ret = bq27x00_simple_value(di->cache.capacity, val); break; @@ -73,7 +81,7 @@ case POWER_SUPPLY_PROP_TEMP: ret = bq27x00_simple_value(di->cache.temperature, val); break; -@@ -547,12 +562,14 @@ static int bq27x00_battery_get_property( +@@ -564,12 +587,14 @@ static int bq27x00_battery_get_property( case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: ret = bq27x00_simple_value(di->charge_design_full, val); break; diff --git a/kernel-power-2.6.28/debian/patches/bq27x00-reg.diff b/kernel-power-2.6.28/debian/patches/bq27x00-reg.diff deleted file mode 100644 index 11a9950..0000000 --- a/kernel-power-2.6.28/debian/patches/bq27x00-reg.diff +++ /dev/null @@ -1,205 +0,0 @@ -diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c -index 46db966..6a6224e 100644 ---- a/drivers/power/bq27x00_battery.c -+++ b/drivers/power/bq27x00_battery.c -@@ -29,12 +29,15 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include - #include - #include - #include -+#include - - #include - -@@ -89,8 +92,34 @@ struct bq27x00_reg_cache { - int flags; - }; - -+#define BQ27X00_READ_REG _IO(MISC_MAJOR, 0) -+ -+/** -+ * struct bq27x00_reg_parms - User data for ioctl call BQ27X00_READ_REG -+ * @reg: Battery register -+ * @single: 1 if register is 8bit, 0 if 16bit -+ * @ret: value of register reg -+ * Ioctl call BQ27X00_READ_REG can be used to read battery register. -+ * If bq27x00_battery is loaded, it is not possible to use i2c-get -+ * to get status of battery registers, so this ioctl can be used. -+ */ -+struct bq27x00_reg_parms { -+ int reg; -+ int single; -+ int ret; -+}; -+ -+struct bq27x00_reg_device { -+ struct miscdevice miscdev; -+ struct bq27x00_device_info *di; -+ struct bq27x00_reg_device *next, *prev; -+}; -+ -+static struct bq27x00_reg_device *bq27x00_reg_devices = NULL; -+ - struct bq27x00_device_info { - struct device *dev; -+ struct bq27x00_reg_device *regdev; - int id; - enum bq27x00_chip chip; - -@@ -141,6 +153,109 @@ static inline int bq27x00_read(struct bq27x00_device_info *di, u8 reg, - return di->bus.read(di, reg, single); - } - -+/* Code for register device access */ -+ -+static long bq27x00_battery_reg_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) -+{ -+ int ret; -+ int minor = iminor(filp->f_dentry->d_inode); -+ struct bq27x00_reg_parms param; -+ struct bq27x00_reg_device *regdev = bq27x00_reg_devices; -+ -+ while (regdev) { -+ if (regdev->miscdev.minor == minor) -+ break; -+ regdev = regdev->next; -+ } -+ -+ if (!regdev) -+ return -ENXIO; -+ -+ if (cmd != BQ27X00_READ_REG) -+ return -EINVAL; -+ -+ ret = copy_from_user(¶m, (void __user *)arg, sizeof(param)); -+ if (ret != 0) -+ return -EACCES; -+ -+ param.ret = bq27x00_read(regdev->di, param.reg, param.single); -+ -+ ret = copy_to_user((void __user *)arg, ¶m, sizeof(param)); -+ if (ret != 0) -+ return -EACCES; -+ -+ return 0; -+} -+ -+static int bq27x00_battery_reg_open(struct inode *inode, struct file *file) -+{ -+ if (!try_module_get(THIS_MODULE)) -+ return -EPERM; -+ -+ return 0; -+} -+ -+static int bq27x00_battery_reg_release(struct inode *inode, struct file *file) -+{ -+ module_put(THIS_MODULE); -+ return 0; -+} -+ -+static struct file_operations bq27x00_reg_fileops = { -+ .owner = THIS_MODULE, -+ .unlocked_ioctl = bq27x00_battery_reg_ioctl, -+ .open = bq27x00_battery_reg_open, -+ .release = bq27x00_battery_reg_release, -+}; -+ -+static int bq27x00_battery_reg_init(struct bq27x00_device_info *di) -+{ -+ struct bq27x00_reg_device *regdev; -+ int ret; -+ -+ regdev = kzalloc(sizeof *regdev, GFP_KERNEL); -+ if (!regdev) -+ return -ENOMEM; -+ -+ regdev->miscdev.minor = MISC_DYNAMIC_MINOR; -+ regdev->miscdev.name = di->bat.name; -+ regdev->miscdev.fops = &bq27x00_reg_fileops; -+ regdev->di = di; -+ -+ ret = misc_register(®dev->miscdev); -+ if (ret != 0) { -+ kfree(regdev); -+ return ret; -+ } -+ -+ di->regdev = regdev; -+ -+ if (bq27x00_reg_devices) -+ bq27x00_reg_devices->prev = regdev; -+ -+ regdev->prev = NULL; -+ regdev->next = bq27x00_reg_devices; -+ bq27x00_reg_devices = regdev; -+ -+ return 0; -+} -+ -+static void bq27x00_battery_reg_exit(struct bq27x00_device_info *di) -+{ -+ misc_deregister(&di->regdev->miscdev); -+ -+ if (di->regdev->next) -+ di->regdev->next->prev = di->regdev->prev; -+ -+ if (di->regdev->prev) -+ di->regdev->prev->next = di->regdev->next; -+ -+ if (di->regdev == bq27x00_reg_devices) -+ bq27x00_reg_devices = NULL; -+ -+ kfree(di->regdev); -+} -+ - /* - * Return the battery Relative State-of-Charge - * Or < 0 if something fails. -@@ -839,6 +839,9 @@ static int bq27x00_battery_probe(struct - - i2c_set_clientdata(client, di); - -+ if (bq27x00_battery_reg_init(di)) -+ di->regdev = NULL; -+ - return 0; - - batt_failed_3: -@@ -859,6 +862,9 @@ static int bq27x00_battery_remove(struct - - bq27x00_powersupply_unregister(di); - -+ if (di->regdev) -+ bq27x00_battery_reg_exit(di); -+ - kfree(di->bat.name); - - mutex_lock(&battery_mutex); -@@ -829,6 +944,9 @@ static int __devinit bq27000_battery_probe(struct platform_device *pdev) - if (ret) - goto err_free; - -+ if (bq27x00_battery_reg_init(di)) -+ di->regdev = NULL; -+ - return 0; - - err_free: -@@ -844,6 +962,9 @@ static int __devexit bq27000_battery_remove(struct platform_device *pdev) - - bq27x00_powersupply_unregister(di); - -+ if (di->regdev) -+ bq27x00_battery_reg_exit(di); -+ - platform_set_drvdata(pdev, NULL); - kfree(di); - diff --git a/kernel-power-2.6.28/debian/patches/bq27x00-upstream.diff b/kernel-power-2.6.28/debian/patches/bq27x00-upstream.diff index abe9637..4d66eb8 100644 --- a/kernel-power-2.6.28/debian/patches/bq27x00-upstream.diff +++ b/kernel-power-2.6.28/debian/patches/bq27x00-upstream.diff @@ -1,5 +1,5 @@ ---- kernel-power-2.6.28/drivers/power/bq27x00_battery.c 2011-09-15 00:34:44.600070307 +0200 -+++ kernel-power-2.6.28/drivers/power/bq27x00_battery.c 2011-09-21 13:16:45.007978008 +0200 +--- kernel-power-2.6.28/drivers/power/bq27x00_battery.c 2011-10-09 17:10:05.891697314 +0200 ++++ kernel-power-2.6.28/drivers/power/bq27x00_battery.c 2011-10-09 17:03:40.571710219 +0200 @@ -3,6 +3,8 @@ * * Copyright (C) 2008 Rodolfo Giometti @@ -9,7 +9,7 @@ * * Based on a previous work by Copyright (C) 2008 Texas Instruments, Inc. * -@@ -15,6 +17,13 @@ +@@ -15,153 +17,488 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * */ @@ -23,16 +23,21 @@ #include #include #include -@@ -24,144 +33,455 @@ + #include + #include ++#include ++#include + #include #include #include #include +#include #include ++#include ++ ++#include -#define DRIVER_VERSION "1.0.0" -+#include -+ +#define DRIVER_VERSION "1.2.0" #define BQ27x00_REG_TEMP 0x06 @@ -90,10 +95,17 @@ + int capacity; + int energy; + int flags; ++}; ++ ++struct bq27x00_reg_device { ++ struct miscdevice miscdev; ++ struct bq27x00_device_info *di; ++ struct list_head list; }; struct bq27x00_device_info { struct device *dev; ++ struct bq27x00_reg_device *regdev; int id; - int voltage_uV; - int current_uA; @@ -140,6 +152,13 @@ +MODULE_PARM_DESC(poll_interval, "battery poll interval in seconds - " \ + "0 disables polling"); + ++/* If the system has several batteries we need a different name for each ++ * of them... ++ */ ++static DEFINE_IDR(battery_id); ++static DEFINE_MUTEX(battery_mutex); ++static LIST_HEAD(battery_list); ++ /* * Common code for BQ27x00 devices */ @@ -152,9 +171,7 @@ - int ret; + return di->bus.read(di, reg, single); +} - -- ret = di->bus->read(reg, rt_value, b_single, di); -- *rt_value = be16_to_cpu(*rt_value); ++ +/* + * Return the battery Relative State-of-Charge + * Or < 0 if something fails. @@ -163,14 +180,16 @@ +{ + int rsoc; -- return ret; +- ret = di->bus->read(reg, rt_value, b_single, di); +- *rt_value = be16_to_cpu(*rt_value); + if (di->chip == BQ27500) + rsoc = bq27x00_read(di, BQ27500_REG_SOC, false); + else + rsoc = bq27x00_read(di, BQ27000_REG_RSOC, true); -+ + +- return ret; + if (rsoc < 0) -+ dev_err(di->dev, "error reading relative State-of-Charge\n"); ++ dev_dbg(di->dev, "error reading relative State-of-Charge\n"); + + return rsoc; } @@ -191,7 +210,7 @@ - if (ret) { + charge = bq27x00_read(di, reg, false); + if (charge < 0) { -+ dev_err(di->dev, "error reading charge register %02x: %d\n", reg, charge); ++ dev_dbg(di->dev, "error reading charge register %02x: %d\n", reg, charge); + return charge; + } + @@ -235,7 +254,7 @@ + ilmd = bq27x00_read(di, BQ27000_REG_ILMD, true); + + if (ilmd < 0) { -+ dev_err(di->dev, "error reading initial last measured discharge\n"); ++ dev_dbg(di->dev, "error reading initial last measured discharge\n"); + return ilmd; + } + @@ -257,7 +276,7 @@ + + ae = bq27x00_read(di, BQ27x00_REG_AE, false); + if (ae < 0) { -+ dev_err(di->dev, "error reading available energy\n"); ++ dev_dbg(di->dev, "error reading available energy\n"); + return ae; + } + @@ -326,7 +345,7 @@ + + tval = bq27x00_read(di, reg, false); + if (tval < 0) { -+ dev_err(di->dev, "error reading time register %02x: %d\n", reg, tval); ++ dev_dbg(di->dev, "error reading time register %02x: %d\n", reg, tval); + return tval; + } + @@ -344,7 +363,7 @@ + cache.flags = bq27x00_read(di, BQ27x00_REG_FLAGS, is_bq27500); + if (cache.flags >= 0) { + if (!is_bq27500 && (cache.flags & BQ27000_FLAG_CI)) { -+ dev_err(di->dev, "battery is not calibrated! ignoring capacity values\n"); ++ dev_info(di->dev, "battery is not calibrated! ignoring capacity values\n"); + cache.capacity = -ENODATA; + cache.energy = -ENODATA; + cache.time_to_empty = -ENODATA; @@ -365,14 +384,14 @@ + /* We only have to read charge design full once */ + if (di->charge_design_full <= 0) + di->charge_design_full = bq27x00_battery_read_ilmd(di); -+ } -+ -+ if (memcmp(&di->cache, &cache, sizeof(cache)) != 0) { -+ di->cache = cache; -+ power_supply_changed(&di->bat); } - return volt; ++ if (memcmp(&di->cache, &cache, sizeof(cache)) != 0) { ++ di->cache = cache; ++ power_supply_changed(&di->bat); ++ } ++ + di->last_update = jiffies; +} + @@ -408,11 +427,10 @@ - ret = bq27x00_read(BQ27x00_REG_AI, &curr, 0, di); - if (ret) { -- dev_err(di->dev, "error reading current\n"); -- return 0; + curr = bq27x00_read(di, BQ27x00_REG_AI, false); + if (curr < 0) { -+ dev_err(di->dev, "error reading current"); + dev_err(di->dev, "error reading current\n"); +- return 0; + return curr; + } + @@ -544,7 +562,7 @@ } #define to_bq27x00_device_info(x) container_of((x), \ -@@ -171,89 +491,167 @@ static int bq27x00_battery_get_property( +@@ -171,89 +508,274 @@ static int bq27x00_battery_get_property( enum power_supply_property psp, union power_supply_propval *val) { @@ -620,21 +638,128 @@ return -EINVAL; } -- return 0; + return ret; - } - --static void bq27x00_powersupply_init(struct bq27x00_device_info *di) ++} ++ +static void bq27x00_external_power_changed(struct power_supply *psy) - { ++{ + struct bq27x00_device_info *di = to_bq27x00_device_info(psy); + + cancel_delayed_work_sync(&di->work); + schedule_delayed_work(&di->work, 0); +} + -+static int bq27x00_powersupply_init(struct bq27x00_device_info *di) ++/* Code for register device access */ ++ ++static struct bq27x00_reg_device * bq27x00_battery_reg_find_device(int minor) ++{ ++ struct bq27x00_reg_device *regdev; ++ ++ list_for_each_entry(regdev, &battery_list, list) ++ if (regdev->miscdev.minor == minor) ++ return regdev; ++ ++ return NULL; ++} ++ ++static long bq27x00_battery_reg_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ++{ ++ int ret; ++ int minor = iminor(filp->f_dentry->d_inode); ++ struct bq27x00_reg_parms param; ++ struct bq27x00_reg_device *regdev = bq27x00_battery_reg_find_device(minor); ++ ++ if (!regdev) ++ return -ENXIO; ++ ++ if (cmd != BQ27X00_READ_REG) ++ return -EINVAL; ++ ++ ret = copy_from_user(¶m, (void __user *)arg, sizeof(param)); ++ if (ret != 0) ++ return -EACCES; ++ ++ param.ret = bq27x00_read(regdev->di, param.reg, param.single); ++ ++ ret = copy_to_user((void __user *)arg, ¶m, sizeof(param)); ++ if (ret != 0) ++ return -EACCES; ++ ++ return 0; ++} ++ ++static int bq27x00_battery_reg_open(struct inode *inode, struct file *file) ++{ ++ if (!try_module_get(THIS_MODULE)) ++ return -EPERM; ++ ++ return 0; ++} ++ ++static int bq27x00_battery_reg_release(struct inode *inode, struct file *file) ++{ ++ module_put(THIS_MODULE); ++ return 0; ++} ++ ++static struct file_operations bq27x00_reg_fileops = { ++ .owner = THIS_MODULE, ++ .unlocked_ioctl = bq27x00_battery_reg_ioctl, ++ .open = bq27x00_battery_reg_open, ++ .release = bq27x00_battery_reg_release, ++}; ++ ++static int bq27x00_battery_reg_init(struct bq27x00_device_info *di) +{ ++ struct bq27x00_reg_device *regdev; ++ int ret; ++ ++ di->regdev = NULL; ++ ++ regdev = kzalloc(sizeof *regdev, GFP_KERNEL); ++ if (!regdev) ++ return -ENOMEM; ++ ++ regdev->miscdev.minor = MISC_DYNAMIC_MINOR; ++ regdev->miscdev.name = di->bat.name; ++ regdev->miscdev.fops = &bq27x00_reg_fileops; ++ ++ ret = misc_register(®dev->miscdev); ++ if (ret != 0) { ++ kfree(regdev); ++ return ret; ++ } ++ ++ regdev->di = di; ++ di->regdev = regdev; ++ ++ INIT_LIST_HEAD(®dev->list); ++ ++ mutex_lock(&battery_mutex); ++ list_add(®dev->list, &battery_list); ++ mutex_unlock(&battery_mutex); ++ + return 0; + } + +-static void bq27x00_powersupply_init(struct bq27x00_device_info *di) ++static void bq27x00_battery_reg_exit(struct bq27x00_device_info *di) ++{ ++ if (!di->regdev) ++ return; ++ ++ misc_deregister(&di->regdev->miscdev); ++ ++ mutex_lock(&battery_mutex); ++ list_del(&di->regdev->list); ++ mutex_unlock(&battery_mutex); ++ ++ kfree(di->regdev); ++ di->regdev = NULL; ++} ++ ++static int bq27x00_powersupply_init(struct bq27x00_device_info *di) + { + int ret; + di->bat.type = POWER_SUPPLY_TYPE_BATTERY; @@ -656,33 +781,31 @@ + dev_info(di->dev, "support ver. %s enabled\n", DRIVER_VERSION); + + bq27x00_update(di); ++ bq27x00_battery_reg_init(di); + + return 0; } -/* - * BQ27200 specific code +- */ +static void bq27x00_powersupply_unregister(struct bq27x00_device_info *di) +{ + cancel_delayed_work_sync(&di->work); + ++ bq27x00_battery_reg_exit(di); ++ + power_supply_unregister(&di->bat); + + mutex_destroy(&di->lock); +} -+ + +-static int bq27200_read(u8 reg, int *rt_value, int b_single, +- struct bq27x00_device_info *di) + +/* i2c specific code */ +#ifdef CONFIG_BATTERY_BQ27X00_I2C + -+/* If the system has several batteries we need a different name for each -+ * of them... - */ -+static DEFINE_IDR(battery_id); -+static DEFINE_MUTEX(battery_mutex); - --static int bq27200_read(u8 reg, int *rt_value, int b_single, -- struct bq27x00_device_info *di) +static int bq27x00_read_i2c(struct bq27x00_device_info *di, u8 reg, bool single) { - struct i2c_client *client = di->client; @@ -728,7 +851,9 @@ - *rt_value = get_unaligned_be16(data); - else - *rt_value = data[0]; ++ mutex_lock(&battery_mutex); + ret = i2c_transfer(client->adapter, msg, ARRAY_SIZE(msg)); ++ mutex_unlock(&battery_mutex); + if (ret < 0) + return ret; @@ -754,7 +879,7 @@ int num; int retval = 0; -@@ -267,7 +665,7 @@ static int bq27200_battery_probe(struct +@@ -267,7 +789,7 @@ static int bq27200_battery_probe(struct if (retval < 0) return retval; @@ -763,7 +888,7 @@ if (!name) { dev_err(&client->dev, "failed to allocate device name\n"); retval = -ENOMEM; -@@ -280,37 +678,20 @@ static int bq27200_battery_probe(struct +@@ -280,37 +802,20 @@ static int bq27200_battery_probe(struct retval = -ENOMEM; goto batt_failed_2; } @@ -785,10 +910,10 @@ - bus->read = &bq27200_read; - di->bus = bus; - di->client = client; +- +- bq27x00_powersupply_init(di); + di->bus.read = &bq27x00_read_i2c; -- bq27x00_powersupply_init(di); -- - retval = power_supply_register(&client->dev, &di->bat); - if (retval) { - dev_err(&client->dev, "failed to register battery\n"); @@ -807,7 +932,7 @@ batt_failed_3: kfree(di); batt_failed_2: -@@ -323,11 +704,11 @@ batt_failed_1: +@@ -323,11 +828,11 @@ batt_failed_1: return retval; } @@ -821,7 +946,7 @@ kfree(di->bat.name); -@@ -340,31 +721,180 @@ static int bq27200_battery_remove(struct +@@ -340,31 +845,180 @@ static int bq27200_battery_remove(struct return 0; } @@ -837,16 +962,21 @@ {}, }; +MODULE_DEVICE_TABLE(i2c, bq27x00_id); -+ + +-static struct i2c_driver bq27200_battery_driver = { +static struct i2c_driver bq27x00_battery_driver = { -+ .driver = { + .driver = { +- .name = "bq27200-battery", + .name = "bq27x00-battery", -+ }, + }, +- .probe = bq27200_battery_probe, +- .remove = bq27200_battery_remove, +- .id_table = bq27200_id, + .probe = bq27x00_battery_probe, + .remove = bq27x00_battery_remove, + .id_table = bq27x00_id, -+}; -+ + }; + +static inline int bq27x00_battery_i2c_init(void) +{ + int ret = i2c_add_driver(&bq27x00_battery_driver); @@ -934,8 +1064,7 @@ + + di->bat.name = pdata->name ?: dev_name(&pdev->dev); + di->bus.read = &bq27000_read_platform; - --static struct i2c_driver bq27200_battery_driver = { ++ + ret = bq27x00_powersupply_init(di); + if (ret) + goto err_free; @@ -964,16 +1093,12 @@ +static struct platform_driver bq27000_battery_driver = { + .probe = bq27000_battery_probe, + .remove = __devexit_p(bq27000_battery_remove), - .driver = { -- .name = "bq27200-battery", ++ .driver = { + .name = "bq27000-battery", + .owner = THIS_MODULE, - }, -- .probe = bq27200_battery_probe, -- .remove = bq27200_battery_remove, -- .id_table = bq27200_id, - }; - ++ }, ++}; ++ +static inline int bq27x00_battery_platform_init(void) +{ + int ret = platform_driver_register(&bq27000_battery_driver); @@ -1015,7 +1140,7 @@ return ret; } -@@ -372,7 +902,8 @@ module_init(bq27x00_battery_init); +@@ -372,7 +1026,8 @@ module_init(bq27x00_battery_init); static void __exit bq27x00_battery_exit(void) { diff --git a/kernel-power-2.6.28/debian/patches/series b/kernel-power-2.6.28/debian/patches/series index ea5afa3..0f1cd81 100644 --- a/kernel-power-2.6.28/debian/patches/series +++ b/kernel-power-2.6.28/debian/patches/series @@ -41,7 +41,6 @@ power-supply-ignore-enodata.diff bq27x00-rx51-board.diff bq27x00-upstream.diff bq27x00-maemo.diff -bq27x00-reg.diff l2cap_parent.diff wl12xx-rx-fix.diff anti-io-stalling.diff