vcs.maemo.org Git - kernel-power/blob - kernel-power-2.6.28/debian/patches/bq27x00_battery.patch

   1 --- kernel-power-2.6.28/drivers/power/bq27x00_battery.c 2011-05-01 01:48:44.000000000 +0200
   2 +++ kernel-power-2.6.28/drivers/power/bq27x00_battery.c 2011-05-01 01:51:12.000000000 +0200
   3 @@ -3,6 +3,8 @@
   4   *
   5   * Copyright (C) 2008 Rodolfo Giometti <giometti@linux.it>
   6   * Copyright (C) 2008 Eurotech S.p.A. <info@eurotech.it>
   7 + * Copyright (C) 2010-2011 Lars-Peter Clausen <lars@metafoo.de>
   8 + * Copyright (C) 2011 Pali Rohár <pali.rohar@gmail.com>
   9   *
  10   * Based on a previous work by Copyright (C) 2008 Texas Instruments, Inc.
  11   *
  12 @@ -15,6 +17,13 @@
  13   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  14   *
  15   */
  16 +
  17 +/*
  18 + * Datasheets:
  19 + * http://focus.ti.com/docs/prod/folders/print/bq27000.html
  20 + * http://focus.ti.com/docs/prod/folders/print/bq27500.html
  21 + */
  22 +
  23  #include <linux/module.h>
  24  #include <linux/param.h>
  25  #include <linux/jiffies.h>
  26 @@ -24,144 +33,410 @@
  27  #include <linux/power_supply.h>
  28  #include <linux/idr.h>
  29  #include <linux/i2c.h>
  30 +#include <linux/slab.h>
  31  #include <asm/unaligned.h>
  32
  33 -#define DRIVER_VERSION                 "1.0.0"
  34 +#define CONFIG_BATTERY_BQ27X00_I2C
  35 +
  36 +struct bq27000_platform_data {
  37 +       const char *name;
  38 +       int (*read)(struct device *dev, unsigned int);
  39 +};
  40 +
  41 +#define DRIVER_VERSION                 "1.2.0"
  42
  43  #define BQ27x00_REG_TEMP               0x06
  44  #define BQ27x00_REG_VOLT               0x08
  45 -#define BQ27x00_REG_RSOC               0x0B /* Relative State-of-Charge */
  46  #define BQ27x00_REG_AI                 0x14
  47  #define BQ27x00_REG_FLAGS              0x0A
  48 +#define BQ27x00_REG_TTE                        0x16
  49 +#define BQ27x00_REG_TTF                        0x18
  50 +#define BQ27x00_REG_TTECP              0x26
  51 +#define BQ27x00_REG_NAC                        0x0C /* Nominal available capaciy */
  52 +#define BQ27x00_REG_LMD                        0x12 /* Last measured discharge */
  53 +#define BQ27x00_REG_CYCT               0x2A /* Cycle count total */
  54 +#define BQ27x00_REG_AE                 0x22 /* Available enery */
  55 +
  56 +#define BQ27000_REG_RSOC               0x0B /* Relative State-of-Charge */
  57 +#define BQ27000_REG_ILMD               0x76 /* Initial last measured discharge */
  58 +#define BQ27000_FLAG_CHGS              BIT(7)
  59 +#define BQ27000_FLAG_FC                        BIT(5)
  60 +
  61 +#define BQ27500_REG_SOC                        0x2C
  62 +#define BQ27500_REG_DCAP               0x3C /* Design capacity */
  63 +#define BQ27500_FLAG_DSC               BIT(0)
  64 +#define BQ27500_FLAG_FC                        BIT(9)
  65
  66 -/* If the system has several batteries we need a different name for each
  67 - * of them...
  68 - */
  69 -static DEFINE_IDR(battery_id);
  70 -static DEFINE_MUTEX(battery_mutex);
  71 +#define BQ27000_RS                     20 /* Resistor sense */
  72
  73  struct bq27x00_device_info;
  74  struct bq27x00_access_methods {
  75 -       int (*read)(u8 reg, int *rt_value, int b_single,
  76 -               struct bq27x00_device_info *di);
  77 +       int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
  78 +};
  79 +
  80 +enum bq27x00_chip { BQ27000, BQ27500 };
  81 +
  82 +struct bq27x00_reg_cache {
  83 +       int temperature;
  84 +       int time_to_empty;
  85 +       int time_to_empty_avg;
  86 +       int time_to_full;
  87 +       int charge_full;
  88 +       int cycle_count;
  89 +       int capacity;
  90 +       int flags;
  91 +
  92 +       int current_now;
  93  };
  94
  95  struct bq27x00_device_info {
  96         struct device           *dev;
  97         int                     id;
  98 -       int                     voltage_uV;
  99 -       int                     current_uA;
 100 -       int                     temp_C;
 101 -       int                     charge_rsoc;
 102 -       struct bq27x00_access_methods   *bus;
 103 +       enum bq27x00_chip       chip;
 104 +
 105 +       struct bq27x00_reg_cache cache;
 106 +       int charge_design_full;
 107 +
 108 +       unsigned long last_update;
 109 +       struct delayed_work work;
 110 +
 111         struct power_supply     bat;
 112
 113 -       struct i2c_client       *client;
 114 +       struct bq27x00_access_methods bus;
 115 +
 116 +       struct mutex lock;
 117  };
 118
 119  static enum power_supply_property bq27x00_battery_props[] = {
 120 +       POWER_SUPPLY_PROP_STATUS,
 121         POWER_SUPPLY_PROP_PRESENT,
 122         POWER_SUPPLY_PROP_VOLTAGE_NOW,
 123         POWER_SUPPLY_PROP_CURRENT_NOW,
 124         POWER_SUPPLY_PROP_CAPACITY,
 125         POWER_SUPPLY_PROP_TEMP,
 126 +       POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,
 127 +       POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG,
 128 +       POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,
 129 +       POWER_SUPPLY_PROP_TECHNOLOGY,
 130 +       POWER_SUPPLY_PROP_CHARGE_FULL,
 131 +       POWER_SUPPLY_PROP_CHARGE_NOW,
 132 +       POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
 133 +       POWER_SUPPLY_PROP_CYCLE_COUNT,
 134  };
 135
 136 +static unsigned int poll_interval = 360;
 137 +module_param(poll_interval, uint, 0644);
 138 +MODULE_PARM_DESC(poll_interval, "battery poll interval in seconds - " \
 139 +                               "0 disables polling");
 140 +
 141  /*
 142   * Common code for BQ27x00 devices
 143   */
 144
 145 -static int bq27x00_read(u8 reg, int *rt_value, int b_single,
 146 -                       struct bq27x00_device_info *di)
 147 +static inline int bq27x00_read(struct bq27x00_device_info *di, u8 reg,
 148 +               bool single)
 149  {
 150 -       int ret;
 151 +       return di->bus.read(di, reg, single);
 152 +}
 153 +
 154 +/*
 155 + * Return the battery Relative State-of-Charge
 156 + * Or < 0 if something fails.
 157 + */
 158 +static int bq27x00_battery_read_rsoc(struct bq27x00_device_info *di)
 159 +{
 160 +       int rsoc;
 161
 162 -       ret = di->bus->read(reg, rt_value, b_single, di);
 163 -       *rt_value = be16_to_cpu(*rt_value);
 164 +       if (di->chip == BQ27500)
 165 +               rsoc = bq27x00_read(di, BQ27500_REG_SOC, false);
 166 +       else
 167 +               rsoc = bq27x00_read(di, BQ27000_REG_RSOC, true);
 168
 169 -       return ret;
 170 +       if (rsoc < 0)
 171 +               dev_err(di->dev, "error reading relative State-of-Charge\n");
 172 +
 173 +       return rsoc;
 174  }
 175
 176  /*
 177 - * Return the battery temperature in Celcius degrees
 178 + * Return a battery charge value in µAh
 179   * Or < 0 if something fails.
 180   */
 181 -static int bq27x00_battery_temperature(struct bq27x00_device_info *di)
 182 +static int bq27x00_battery_read_charge(struct bq27x00_device_info *di, u8 reg)
 183  {
 184 -       int ret;
 185 -       int temp = 0;
 186 +       int charge;
 187
 188 -       ret = bq27x00_read(BQ27x00_REG_TEMP, &temp, 0, di);
 189 -       if (ret) {
 190 -               dev_err(di->dev, "error reading temperature\n");
 191 -               return ret;
 192 +       charge = bq27x00_read(di, reg, false);
 193 +       if (charge < 0) {
 194 +               dev_err(di->dev, "error reading nominal available capacity\n");
 195 +               return charge;
 196         }
 197
 198 -       return (temp >> 2) - 273;
 199 +       if (di->chip == BQ27500)
 200 +               charge *= 1000;
 201 +       else
 202 +               charge = charge * 3570 / BQ27000_RS;
 203 +
 204 +       return charge;
 205  }
 206
 207  /*
 208 - * Return the battery Voltage in milivolts
 209 + * Return the battery Nominal available capaciy in µAh
 210   * Or < 0 if something fails.
 211   */
 212 -static int bq27x00_battery_voltage(struct bq27x00_device_info *di)
 213 +static inline int bq27x00_battery_read_nac(struct bq27x00_device_info *di)
 214  {
 215 -       int ret;
 216 -       int volt = 0;
 217 +       return bq27x00_battery_read_charge(di, BQ27x00_REG_NAC);
 218 +}
 219
 220 -       ret = bq27x00_read(BQ27x00_REG_VOLT, &volt, 0, di);
 221 -       if (ret) {
 222 -               dev_err(di->dev, "error reading voltage\n");
 223 -               return ret;
 224 +/*
 225 + * Return the battery Last measured discharge in µAh
 226 + * Or < 0 if something fails.
 227 + */
 228 +static inline int bq27x00_battery_read_lmd(struct bq27x00_device_info *di)
 229 +{
 230 +       return bq27x00_battery_read_charge(di, BQ27x00_REG_LMD);
 231 +}
 232 +
 233 +/*
 234 + * Return the battery Initial last measured discharge in µAh
 235 + * Or < 0 if something fails.
 236 + */
 237 +static int bq27x00_battery_read_ilmd(struct bq27x00_device_info *di)
 238 +{
 239 +       int ilmd;
 240 +
 241 +       if (di->chip == BQ27500)
 242 +               ilmd = bq27x00_read(di, BQ27500_REG_DCAP, false);
 243 +       else
 244 +               ilmd = bq27x00_read(di, BQ27000_REG_ILMD, true);
 245 +
 246 +       if (ilmd < 0) {
 247 +               dev_err(di->dev, "error reading initial last measured discharge\n");
 248 +               return ilmd;
 249         }
 250
 251 -       return volt;
 252 +       if (di->chip == BQ27500)
 253 +               ilmd *= 1000;
 254 +       else
 255 +               ilmd = ilmd * 256 * 3570 / BQ27000_RS;
 256 +
 257 +       return ilmd;
 258  }
 259
 260  /*
 261 - * Return the battery average current
 262 - * Note that current can be negative signed as well
 263 - * Or 0 if something fails.
 264 + * Return the battery Cycle count total
 265 + * Or < 0 if something fails.
 266   */
 267 -static int bq27x00_battery_current(struct bq27x00_device_info *di)
 268 +static int bq27x00_battery_read_cyct(struct bq27x00_device_info *di)
 269  {
 270 -       int ret;
 271 -       int curr = 0;
 272 -       int flags = 0;
 273 +       int cyct;
 274
 275 -       ret = bq27x00_read(BQ27x00_REG_AI, &curr, 0, di);
 276 -       if (ret) {
 277 -               dev_err(di->dev, "error reading current\n");
 278 -               return 0;
 279 +       cyct = bq27x00_read(di, BQ27x00_REG_CYCT, false);
 280 +       if (cyct < 0)
 281 +               dev_err(di->dev, "error reading cycle count total\n");
 282 +
 283 +       return cyct;
 284 +}
 285 +
 286 +/*
 287 + * Read a time register.
 288 + * Return < 0 if something fails.
 289 + */
 290 +static int bq27x00_battery_read_time(struct bq27x00_device_info *di, u8 reg)
 291 +{
 292 +       int tval;
 293 +
 294 +       tval = bq27x00_read(di, reg, false);
 295 +       if (tval < 0) {
 296 +               dev_err(di->dev, "error reading register %02x: %d\n", reg, tval);
 297 +               return tval;
 298         }
 299 -       ret = bq27x00_read(BQ27x00_REG_FLAGS, &flags, 0, di);
 300 -       if (ret < 0) {
 301 -               dev_err(di->dev, "error reading flags\n");
 302 +
 303 +       if (tval == 65535)
 304                 return 0;
 305 +
 306 +       return tval * 60;
 307 +}
 308 +
 309 +static void bq27x00_update(struct bq27x00_device_info *di)
 310 +{
 311 +       struct bq27x00_reg_cache cache = {0, };
 312 +       bool is_bq27500 = di->chip == BQ27500;
 313 +
 314 +       cache.flags = bq27x00_read(di, BQ27x00_REG_FLAGS, is_bq27500);
 315 +       if (cache.flags >= 0) {
 316 +               cache.capacity = bq27x00_battery_read_rsoc(di);
 317 +               cache.temperature = bq27x00_read(di, BQ27x00_REG_TEMP, false);
 318 +               cache.time_to_empty = bq27x00_battery_read_time(di, BQ27x00_REG_TTE);
 319 +               cache.time_to_empty_avg = bq27x00_battery_read_time(di, BQ27x00_REG_TTECP);
 320 +               cache.time_to_full = bq27x00_battery_read_time(di, BQ27x00_REG_TTF);
 321 +               cache.charge_full = bq27x00_battery_read_lmd(di);
 322 +               cache.cycle_count = bq27x00_battery_read_cyct(di);
 323 +
 324 +               if (!is_bq27500)
 325 +                       cache.current_now = bq27x00_read(di, BQ27x00_REG_AI, false);
 326 +
 327 +               /* We only have to read charge design full once */
 328 +               if (di->charge_design_full <= 0)
 329 +                       di->charge_design_full = bq27x00_battery_read_ilmd(di);
 330         }
 331 -       if ((flags & (1 << 7)) != 0) {
 332 -               dev_dbg(di->dev, "negative current!\n");
 333 -               return -curr;
 334 +
 335 +       /* Ignore current_now which is a snapshot of the current battery state
 336 +        * and is likely to be different even between two consecutive reads */
 337 +       if (memcmp(&di->cache, &cache, sizeof(cache) - sizeof(int)) != 0) {
 338 +               di->cache = cache;
 339 +               power_supply_changed(&di->bat);
 340 +       }
 341 +
 342 +       di->last_update = jiffies;
 343 +}
 344 +
 345 +static void bq27x00_battery_poll(struct work_struct *work)
 346 +{
 347 +       struct bq27x00_device_info *di =
 348 +               container_of(work, struct bq27x00_device_info, work.work);
 349 +
 350 +       bq27x00_update(di);
 351 +
 352 +       if (poll_interval > 0) {
 353 +               schedule_delayed_work(&di->work, poll_interval * HZ);
 354         }
 355 -       return curr;
 356  }
 357
 358 +
 359  /*
 360 - * Return the battery Relative State-of-Charge
 361 + * Return the battery temperature in tenths of degree Celsius
 362   * Or < 0 if something fails.
 363   */
 364 -static int bq27x00_battery_rsoc(struct bq27x00_device_info *di)
 365 +static int bq27x00_battery_temperature(struct bq27x00_device_info *di,
 366 +       union power_supply_propval *val)
 367  {
 368 -       int ret;
 369 -       int rsoc = 0;
 370 +       if (di->cache.temperature < 0)
 371 +               return di->cache.temperature;
 372
 373 -       ret = bq27x00_read(BQ27x00_REG_RSOC, &rsoc, 1, di);
 374 -       if (ret) {
 375 -               dev_err(di->dev, "error reading relative State-of-Charge\n");
 376 -               return ret;
 377 +       if (di->chip == BQ27500)
 378 +               val->intval = di->cache.temperature - 2731;
 379 +       else
 380 +               val->intval = ((di->cache.temperature * 5) - 5463) / 2;
 381 +
 382 +       return 0;
 383 +}
 384 +
 385 +/*
 386 + * Return the battery average current in µA
 387 + * Note that current can be negative signed as well
 388 + * Or 0 if something fails.
 389 + */
 390 +static int bq27x00_battery_current(struct bq27x00_device_info *di,
 391 +       union power_supply_propval *val)
 392 +{
 393 +       int curr;
 394 +
 395 +       if (di->chip == BQ27500)
 396 +           curr = bq27x00_read(di, BQ27x00_REG_AI, false);
 397 +       else
 398 +           curr = di->cache.current_now;
 399 +
 400 +       if (curr < 0)
 401 +               return curr;
 402 +
 403 +       if (di->chip == BQ27500) {
 404 +               /* bq27500 returns signed value */
 405 +               val->intval = (int)((s16)curr) * 1000;
 406 +       } else {
 407 +               if (di->cache.flags & BQ27000_FLAG_CHGS) {
 408 +                       dev_dbg(di->dev, "negative current!\n");
 409 +                       curr = -curr;
 410 +               }
 411 +
 412 +               val->intval = curr * 3570 / BQ27000_RS;
 413         }
 414
 415 -       return rsoc >> 8;
 416 +       return 0;
 417 +}
 418 +
 419 +static int bq27x00_battery_status(struct bq27x00_device_info *di,
 420 +       union power_supply_propval *val)
 421 +{
 422 +       int status;
 423 +
 424 +       if (di->chip == BQ27500) {
 425 +               if (di->cache.flags & BQ27500_FLAG_FC)
 426 +                       status = POWER_SUPPLY_STATUS_FULL;
 427 +               else if (di->cache.flags & BQ27500_FLAG_DSC)
 428 +                       status = POWER_SUPPLY_STATUS_DISCHARGING;
 429 +               else
 430 +                       status = POWER_SUPPLY_STATUS_CHARGING;
 431 +       } else {
 432 +               if (di->cache.flags & BQ27000_FLAG_FC)
 433 +                       status = POWER_SUPPLY_STATUS_FULL;
 434 +               else if (di->cache.flags & BQ27000_FLAG_CHGS)
 435 +                       status = POWER_SUPPLY_STATUS_CHARGING;
 436 +               else if (power_supply_am_i_supplied(&di->bat))
 437 +                       status = POWER_SUPPLY_STATUS_NOT_CHARGING;
 438 +               else
 439 +                       status = POWER_SUPPLY_STATUS_DISCHARGING;
 440 +       }
 441 +
 442 +       val->intval = status;
 443 +
 444 +       return 0;
 445 +}
 446 +
 447 +/*
 448 + * Return the battery Voltage in milivolts
 449 + * Or < 0 if something fails.
 450 + */
 451 +static int bq27x00_battery_voltage(struct bq27x00_device_info *di,
 452 +       union power_supply_propval *val)
 453 +{
 454 +       int volt;
 455 +
 456 +       volt = bq27x00_read(di, BQ27x00_REG_VOLT, false);
 457 +       if (volt < 0)
 458 +               return volt;
 459 +
 460 +       val->intval = volt * 1000;
 461 +
 462 +       return 0;
 463 +}
 464 +
 465 +/*
 466 + * Return the battery Available energy in µWh
 467 + * Or < 0 if something fails.
 468 + */
 469 +static int bq27x00_battery_energy(struct bq27x00_device_info *di,
 470 +       union power_supply_propval *val)
 471 +{
 472 +       int ae;
 473 +
 474 +       ae = bq27x00_read(di, BQ27x00_REG_AE, false);
 475 +       if (ae < 0) {
 476 +               dev_err(di->dev, "error reading available energy\n");
 477 +               return ae;
 478 +       }
 479 +
 480 +       if (di->chip == BQ27500)
 481 +               ae *= 1000;
 482 +       else
 483 +               ae = ae * 29200 / BQ27000_RS;
 484 +
 485 +       val->intval = ae;
 486 +
 487 +       return 0;
 488 +}
 489 +
 490 +
 491 +static int bq27x00_simple_value(int value,
 492 +       union power_supply_propval *val)
 493 +{
 494 +       if (value < 0)
 495 +               return value;
 496 +
 497 +       val->intval = value;
 498 +
 499 +       return 0;
 500  }
 501
 502  #define to_bq27x00_device_info(x) container_of((x), \
 503 @@ -171,89 +446,164 @@ static int bq27x00_battery_get_property(
 504                                         enum power_supply_property psp,
 505                                         union power_supply_propval *val)
 506  {
 507 +       int ret = 0;
 508         struct bq27x00_device_info *di = to_bq27x00_device_info(psy);
 509
 510 +       mutex_lock(&di->lock);
 511 +       if (time_is_before_jiffies(di->last_update + 5 * HZ)) {
 512 +               cancel_delayed_work_sync(&di->work);
 513 +               bq27x00_battery_poll(&di->work.work);
 514 +       }
 515 +       mutex_unlock(&di->lock);
 516 +
 517 +       if (psp != POWER_SUPPLY_PROP_PRESENT && di->cache.flags < 0)
 518 +               return -ENODEV;
 519 +
 520         switch (psp) {
 521 +       case POWER_SUPPLY_PROP_STATUS:
 522 +               ret = bq27x00_battery_status(di, val);
 523 +               break;
 524         case POWER_SUPPLY_PROP_VOLTAGE_NOW:
 525 +               ret = bq27x00_battery_voltage(di, val);
 526 +               break;
 527         case POWER_SUPPLY_PROP_PRESENT:
 528 -               val->intval = bq27x00_battery_voltage(di);
 529 -               if (psp == POWER_SUPPLY_PROP_PRESENT)
 530 -                       val->intval = val->intval <= 0 ? 0 : 1;
 531 +               val->intval = di->cache.flags < 0 ? 0 : 1;
 532                 break;
 533         case POWER_SUPPLY_PROP_CURRENT_NOW:
 534 -               val->intval = bq27x00_battery_current(di);
 535 +               ret = bq27x00_battery_current(di, val);
 536                 break;
 537         case POWER_SUPPLY_PROP_CAPACITY:
 538 -               val->intval = bq27x00_battery_rsoc(di);
 539 +               ret = bq27x00_simple_value(di->cache.capacity, val);
 540                 break;
 541         case POWER_SUPPLY_PROP_TEMP:
 542 -               val->intval = bq27x00_battery_temperature(di);
 543 +               ret = bq27x00_battery_temperature(di, val);
 544 +               break;
 545 +       case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW:
 546 +               ret = bq27x00_simple_value(di->cache.time_to_empty, val);
 547 +               break;
 548 +       case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:
 549 +               ret = bq27x00_simple_value(di->cache.time_to_empty_avg, val);
 550 +               break;
 551 +       case POWER_SUPPLY_PROP_TIME_TO_FULL_NOW:
 552 +               ret = bq27x00_simple_value(di->cache.time_to_full, val);
 553 +               break;
 554 +       case POWER_SUPPLY_PROP_TECHNOLOGY:
 555 +               val->intval = POWER_SUPPLY_TECHNOLOGY_LION;
 556 +               break;
 557 +       case POWER_SUPPLY_PROP_CHARGE_NOW:
 558 +               ret = bq27x00_simple_value(bq27x00_battery_read_nac(di), val);
 559 +               break;
 560 +       case POWER_SUPPLY_PROP_CHARGE_FULL:
 561 +               ret = bq27x00_simple_value(di->cache.charge_full, val);
 562 +               break;
 563 +       case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
 564 +               ret = bq27x00_simple_value(di->charge_design_full, val);
 565 +               break;
 566 +       case POWER_SUPPLY_PROP_CYCLE_COUNT:
 567 +               ret = bq27x00_simple_value(di->cache.cycle_count, val);
 568 +               break;
 569 +       case POWER_SUPPLY_PROP_ENERGY_NOW:
 570 +               ret = bq27x00_battery_energy(di, val);
 571                 break;
 572         default:
 573                 return -EINVAL;
 574         }
 575
 576 -       return 0;
 577 +       return ret;
 578  }
 579
 580 -static void bq27x00_powersupply_init(struct bq27x00_device_info *di)
 581 +static void bq27x00_external_power_changed(struct power_supply *psy)
 582  {
 583 +       struct bq27x00_device_info *di = to_bq27x00_device_info(psy);
 584 +
 585 +       cancel_delayed_work_sync(&di->work);
 586 +       schedule_delayed_work(&di->work, 0);
 587 +}
 588 +
 589 +static int bq27x00_powersupply_init(struct bq27x00_device_info *di)
 590 +{
 591 +       int ret;
 592 +
 593         di->bat.type = POWER_SUPPLY_TYPE_BATTERY;
 594         di->bat.properties = bq27x00_battery_props;
 595         di->bat.num_properties = ARRAY_SIZE(bq27x00_battery_props);
 596         di->bat.get_property = bq27x00_battery_get_property;
 597 -       di->bat.external_power_changed = NULL;
 598 +       di->bat.external_power_changed = bq27x00_external_power_changed;
 599 +
 600 +       INIT_DELAYED_WORK(&di->work, bq27x00_battery_poll);
 601 +       mutex_init(&di->lock);
 602 +
 603 +       ret = power_supply_register(di->dev, &di->bat);
 604 +       if (ret) {
 605 +               dev_err(di->dev, "failed to register battery: %d\n", ret);
 606 +               return ret;
 607 +       }
 608 +
 609 +       dev_info(di->dev, "support ver. %s enabled\n", DRIVER_VERSION);
 610 +
 611 +       bq27x00_update(di);
 612 +
 613 +       return 0;
 614  }
 615
 616 -/*
 617 - * BQ27200 specific code
 618 +static void bq27x00_powersupply_unregister(struct bq27x00_device_info *di)
 619 +{
 620 +       cancel_delayed_work_sync(&di->work);
 621 +
 622 +       power_supply_unregister(&di->bat);
 623 +
 624 +       mutex_destroy(&di->lock);
 625 +}
 626 +
 627 +
 628 +/* i2c specific code */
 629 +#ifdef CONFIG_BATTERY_BQ27X00_I2C
 630 +
 631 +/* If the system has several batteries we need a different name for each
 632 + * of them...
 633   */
 634 +static DEFINE_IDR(battery_id);
 635 +static DEFINE_MUTEX(battery_mutex);
 636
 637 -static int bq27200_read(u8 reg, int *rt_value, int b_single,
 638 -                       struct bq27x00_device_info *di)
 639 +static int bq27x00_read_i2c(struct bq27x00_device_info *di, u8 reg, bool single)
 640  {
 641 -       struct i2c_client *client = di->client;
 642 -       struct i2c_msg msg[1];
 643 +       struct i2c_client *client = to_i2c_client(di->dev);
 644 +       struct i2c_msg msg[2];
 645         unsigned char data[2];
 646 -       int err;
 647 +       int ret;
 648
 649         if (!client->adapter)
 650                 return -ENODEV;
 651
 652 -       msg->addr = client->addr;
 653 -       msg->flags = 0;
 654 -       msg->len = 1;
 655 -       msg->buf = data;
 656 -
 657 -       data[0] = reg;
 658 -       err = i2c_transfer(client->adapter, msg, 1);
 659 -
 660 -       if (err >= 0) {
 661 -               if (!b_single)
 662 -                       msg->len = 2;
 663 -               else
 664 -                       msg->len = 1;
 665 +       msg[0].addr = client->addr;
 666 +       msg[0].flags = 0;
 667 +       msg[0].buf = &reg;
 668 +       msg[0].len = sizeof(reg);
 669 +       msg[1].addr = client->addr;
 670 +       msg[1].flags = I2C_M_RD;
 671 +       msg[1].buf = data;
 672 +       if (single)
 673 +               msg[1].len = 1;
 674 +       else
 675 +               msg[1].len = 2;
 676
 677 -               msg->flags = I2C_M_RD;
 678 -               err = i2c_transfer(client->adapter, msg, 1);
 679 -               if (err >= 0) {
 680 -                       if (!b_single)
 681 -                               *rt_value = get_unaligned_be16(data);
 682 -                       else
 683 -                               *rt_value = data[0];
 684 +       ret = i2c_transfer(client->adapter, msg, ARRAY_SIZE(msg));
 685 +       if (ret < 0)
 686 +               return ret;
 687
 688 -                       return 0;
 689 -               }
 690 -       }
 691 -       return err;
 692 +       if (!single)
 693 +               ret = get_unaligned_le16(data);
 694 +       else
 695 +               ret = data[0];
 696 +
 697 +       return ret;
 698  }
 699
 700 -static int bq27200_battery_probe(struct i2c_client *client,
 701 +static int bq27x00_battery_probe(struct i2c_client *client,
 702                                  const struct i2c_device_id *id)
 703  {
 704         char *name;
 705         struct bq27x00_device_info *di;
 706 -       struct bq27x00_access_methods *bus;
 707         int num;
 708         int retval = 0;
 709
 710 @@ -267,7 +617,7 @@ static int bq27200_battery_probe(struct
 711         if (retval < 0)
 712                 return retval;
 713
 714 -       name = kasprintf(GFP_KERNEL, "bq27200-%d", num);
 715 +       name = kasprintf(GFP_KERNEL, "%s-%d", id->name, num);
 716         if (!name) {
 717                 dev_err(&client->dev, "failed to allocate device name\n");
 718                 retval = -ENOMEM;
 719 @@ -280,37 +630,20 @@ static int bq27200_battery_probe(struct
 720                 retval = -ENOMEM;
 721                 goto batt_failed_2;
 722         }
 723 -       di->id = num;
 724
 725 -       bus = kzalloc(sizeof(*bus), GFP_KERNEL);
 726 -       if (!bus) {
 727 -               dev_err(&client->dev, "failed to allocate access method "
 728 -                                       "data\n");
 729 -               retval = -ENOMEM;
 730 -               goto batt_failed_3;
 731 -       }
 732 -
 733 -       i2c_set_clientdata(client, di);
 734 +       di->id = num;
 735         di->dev = &client->dev;
 736 +       di->chip = id->driver_data;
 737         di->bat.name = name;
 738 -       bus->read = &bq27200_read;
 739 -       di->bus = bus;
 740 -       di->client = client;
 741 -
 742 -       bq27x00_powersupply_init(di);
 743 +       di->bus.read = &bq27x00_read_i2c;
 744
 745 -       retval = power_supply_register(&client->dev, &di->bat);
 746 -       if (retval) {
 747 -               dev_err(&client->dev, "failed to register battery\n");
 748 -               goto batt_failed_4;
 749 -       }
 750 +       if (bq27x00_powersupply_init(di))
 751 +               goto batt_failed_3;
 752
 753 -       dev_info(&client->dev, "support ver. %s enabled\n", DRIVER_VERSION);
 754 +       i2c_set_clientdata(client, di);
 755
 756         return 0;
 757
 758 -batt_failed_4:
 759 -       kfree(bus);
 760  batt_failed_3:
 761         kfree(di);
 762  batt_failed_2:
 763 @@ -323,11 +656,11 @@ batt_failed_1:
 764         return retval;
 765  }
 766
 767 -static int bq27200_battery_remove(struct i2c_client *client)
 768 +static int bq27x00_battery_remove(struct i2c_client *client)
 769  {
 770         struct bq27x00_device_info *di = i2c_get_clientdata(client);
 771
 772 -       power_supply_unregister(&di->bat);
 773 +       bq27x00_powersupply_unregister(di);
 774
 775         kfree(di->bat.name);
 776
 777 @@ -340,31 +673,180 @@ static int bq27200_battery_remove(struct
 778         return 0;
 779  }
 780
 781 -/*
 782 - * Module stuff
 783 - */
 784 -
 785 -static const struct i2c_device_id bq27200_id[] = {
 786 -       { "bq27200", 0 },
 787 +static const struct i2c_device_id bq27x00_id[] = {
 788 +       { "bq27200", BQ27000 }, /* bq27200 is same as bq27000, but with i2c */
 789 +       { "bq27500", BQ27500 },
 790         {},
 791  };
 792 +MODULE_DEVICE_TABLE(i2c, bq27x00_id);
 793 +
 794 +static struct i2c_driver bq27x00_battery_driver = {
 795 +       .driver = {
 796 +               .name = "bq27x00-battery",
 797 +       },
 798 +       .probe = bq27x00_battery_probe,
 799 +       .remove = bq27x00_battery_remove,
 800 +       .id_table = bq27x00_id,
 801 +};
 802 +
 803 +static inline int bq27x00_battery_i2c_init(void)
 804 +{
 805 +       int ret = i2c_add_driver(&bq27x00_battery_driver);
 806 +       if (ret)
 807 +               printk(KERN_ERR "Unable to register BQ27x00 i2c driver\n");
 808 +
 809 +       return ret;
 810 +}
 811 +
 812 +static inline void bq27x00_battery_i2c_exit(void)
 813 +{
 814 +       i2c_del_driver(&bq27x00_battery_driver);
 815 +}
 816 +
 817 +#else
 818 +
 819 +static inline int bq27x00_battery_i2c_init(void) { return 0; }
 820 +static inline void bq27x00_battery_i2c_exit(void) {};
 821 +
 822 +#endif
 823 +
 824 +/* platform specific code */
 825 +#ifdef CONFIG_BATTERY_BQ27X00_PLATFORM
 826 +
 827 +static int bq27000_read_platform(struct bq27x00_device_info *di, u8 reg,
 828 +                       bool single)
 829 +{
 830 +       struct device *dev = di->dev;
 831 +       struct bq27000_platform_data *pdata = dev->platform_data;
 832 +       unsigned int timeout = 3;
 833 +       int upper, lower;
 834 +       int temp;
 835 +
 836 +       if (!single) {
 837 +               /* Make sure the value has not changed in between reading the
 838 +                * lower and the upper part */
 839 +               upper = pdata->read(dev, reg + 1);
 840 +               do {
 841 +                       temp = upper;
 842 +                       if (upper < 0)
 843 +                               return upper;
 844 +
 845 +                       lower = pdata->read(dev, reg);
 846 +                       if (lower < 0)
 847 +                               return lower;
 848 +
 849 +                       upper = pdata->read(dev, reg + 1);
 850 +               } while (temp != upper && --timeout);
 851 +
 852 +               if (timeout == 0)
 853 +                       return -EIO;
 854 +
 855 +               return (upper << 8) | lower;
 856 +       }
 857 +
 858 +       return pdata->read(dev, reg);
 859 +}
 860 +
 861 +static int __devinit bq27000_battery_probe(struct platform_device *pdev)
 862 +{
 863 +       struct bq27x00_device_info *di;
 864 +       struct bq27000_platform_data *pdata = pdev->dev.platform_data;
 865 +       int ret;
 866 +
 867 +       if (!pdata) {
 868 +               dev_err(&pdev->dev, "no platform_data supplied\n");
 869 +               return -EINVAL;
 870 +       }
 871 +
 872 +       if (!pdata->read) {
 873 +               dev_err(&pdev->dev, "no hdq read callback supplied\n");
 874 +               return -EINVAL;
 875 +       }
 876 +
 877 +       di = kzalloc(sizeof(*di), GFP_KERNEL);
 878 +       if (!di) {
 879 +               dev_err(&pdev->dev, "failed to allocate device info data\n");
 880 +               return -ENOMEM;
 881 +       }
 882 +
 883 +       platform_set_drvdata(pdev, di);
 884 +
 885 +       di->dev = &pdev->dev;
 886 +       di->chip = BQ27000;
 887 +
 888 +       di->bat.name = pdata->name ?: dev_name(&pdev->dev);
 889 +       di->bus.read = &bq27000_read_platform;
 890
 891 -static struct i2c_driver bq27200_battery_driver = {
 892 +       ret = bq27x00_powersupply_init(di);
 893 +       if (ret)
 894 +               goto err_free;
 895 +
 896 +       return 0;
 897 +
 898 +err_free:
 899 +       platform_set_drvdata(pdev, NULL);
 900 +       kfree(di);
 901 +
 902 +       return ret;
 903 +}
 904 +
 905 +static int __devexit bq27000_battery_remove(struct platform_device *pdev)
 906 +{
 907 +       struct bq27x00_device_info *di = platform_get_drvdata(pdev);
 908 +
 909 +       bq27x00_powersupply_unregister(di);
 910 +
 911 +       platform_set_drvdata(pdev, NULL);
 912 +       kfree(di);
 913 +
 914 +       return 0;
 915 +}
 916 +
 917 +static struct platform_driver bq27000_battery_driver = {
 918 +       .probe  = bq27000_battery_probe,
 919 +       .remove = __devexit_p(bq27000_battery_remove),
 920         .driver = {
 921 -               .name = "bq27200-battery",
 922 +               .name = "bq27000-battery",
 923 +               .owner = THIS_MODULE,
 924         },
 925 -       .probe = bq27200_battery_probe,
 926 -       .remove = bq27200_battery_remove,
 927 -       .id_table = bq27200_id,
 928  };
 929
 930 +static inline int bq27x00_battery_platform_init(void)
 931 +{
 932 +       int ret = platform_driver_register(&bq27000_battery_driver);
 933 +       if (ret)
 934 +               printk(KERN_ERR "Unable to register BQ27000 platform driver\n");
 935 +
 936 +       return ret;
 937 +}
 938 +
 939 +static inline void bq27x00_battery_platform_exit(void)
 940 +{
 941 +       platform_driver_unregister(&bq27000_battery_driver);
 942 +}
 943 +
 944 +#else
 945 +
 946 +static inline int bq27x00_battery_platform_init(void) { return 0; }
 947 +static inline void bq27x00_battery_platform_exit(void) {};
 948 +
 949 +#endif
 950 +
 951 +/*
 952 + * Module stuff
 953 + */
 954 +
 955  static int __init bq27x00_battery_init(void)
 956  {
 957         int ret;
 958
 959 -       ret = i2c_add_driver(&bq27200_battery_driver);
 960 +       ret = bq27x00_battery_i2c_init();
 961 +       if (ret)
 962 +               return ret;
 963 +
 964 +       ret = bq27x00_battery_platform_init();
 965         if (ret)
 966 -               printk(KERN_ERR "Unable to register BQ27200 driver\n");
 967 +               bq27x00_battery_i2c_exit();
 968
 969         return ret;
 970  }
 971 @@ -372,7 +854,8 @@ module_init(bq27x00_battery_init);
 972
 973  static void __exit bq27x00_battery_exit(void)
 974  {
 975 -       i2c_del_driver(&bq27200_battery_driver);
 976 +       bq27x00_battery_platform_exit();
 977 +       bq27x00_battery_i2c_exit();
 978  }
 979  module_exit(bq27x00_battery_exit);
 980