git.samba.org / sfrench / cifs-2.6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge tag 'for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...
[sfrench/cifs-2.6.git] / drivers / power / bq27xxx_battery.c
diff --git a/drivers/power/bq27xxx_battery.c b/drivers/power/bq27xxx_battery.c
index 01737fab0048f2cf826b5facfcc43de728e9ecc2..323d05a12f9b80fc855286d74a9b0e72021d1a03 100644 (file)
--- a/drivers/power/bq27xxx_battery.c
+++ b/drivers/power/bq27xxx_battery.c
@@ -82,6 +82,7 @@
  *
  * These are indexes into a device's register mapping array.
  */
+
 enum bq27xxx_reg_index {
        BQ27XXX_REG_CTRL = 0,   /* Control */
        BQ27XXX_REG_TEMP,       /* Temperature */
@@ -100,157 +101,144 @@ enum bq27xxx_reg_index {
        BQ27XXX_REG_SOC,        /* State-of-Charge */
        BQ27XXX_REG_DCAP,       /* Design Capacity */
        BQ27XXX_REG_AP,         /* Average Power */
+       BQ27XXX_REG_MAX,        /* sentinel */
 };
 
 /* Register mappings */
-static u8 bq27000_regs[] = {
-       [BQ27XXX_REG_CTRL] = 0x00,
-       [BQ27XXX_REG_TEMP] = 0x06,
-       [BQ27XXX_REG_INT_TEMP] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_VOLT] = 0x08,
-       [BQ27XXX_REG_AI] = 0x14,
-       [BQ27XXX_REG_FLAGS] = 0x0a,
-       [BQ27XXX_REG_TTE] = 0x16,
-       [BQ27XXX_REG_TTF] = 0x18,
-       [BQ27XXX_REG_TTES] = 0x1c,
-       [BQ27XXX_REG_TTECP] = 0x26,
-       [BQ27XXX_REG_NAC] = 0x0c,
-       [BQ27XXX_REG_FCC] = 0x12,
-       [BQ27XXX_REG_CYCT] = 0x2a,
-       [BQ27XXX_REG_AE] = 0x22,
-       [BQ27XXX_REG_SOC] = 0x0b,
-       [BQ27XXX_REG_DCAP] = 0x76,
-       [BQ27XXX_REG_AP] = 0x24,
-};
-
-static u8 bq27010_regs[] = {
-       [BQ27XXX_REG_CTRL] = 0x00,
-       [BQ27XXX_REG_TEMP] = 0x06,
-       [BQ27XXX_REG_INT_TEMP] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_VOLT] = 0x08,
-       [BQ27XXX_REG_AI] = 0x14,
-       [BQ27XXX_REG_FLAGS] = 0x0a,
-       [BQ27XXX_REG_TTE] = 0x16,
-       [BQ27XXX_REG_TTF] = 0x18,
-       [BQ27XXX_REG_TTES] = 0x1c,
-       [BQ27XXX_REG_TTECP] = 0x26,
-       [BQ27XXX_REG_NAC] = 0x0c,
-       [BQ27XXX_REG_FCC] = 0x12,
-       [BQ27XXX_REG_CYCT] = 0x2a,
-       [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_SOC] = 0x0b,
-       [BQ27XXX_REG_DCAP] = 0x76,
-       [BQ27XXX_REG_AP] = INVALID_REG_ADDR,
-};
-
-static u8 bq27500_regs[] = {
-       [BQ27XXX_REG_CTRL] = 0x00,
-       [BQ27XXX_REG_TEMP] = 0x06,
-       [BQ27XXX_REG_INT_TEMP] = 0x28,
-       [BQ27XXX_REG_VOLT] = 0x08,
-       [BQ27XXX_REG_AI] = 0x14,
-       [BQ27XXX_REG_FLAGS] = 0x0a,
-       [BQ27XXX_REG_TTE] = 0x16,
-       [BQ27XXX_REG_TTF] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_TTES] = 0x1a,
-       [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_NAC] = 0x0c,
-       [BQ27XXX_REG_FCC] = 0x12,
-       [BQ27XXX_REG_CYCT] = 0x2a,
-       [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_SOC] = 0x2c,
-       [BQ27XXX_REG_DCAP] = 0x3c,
-       [BQ27XXX_REG_AP] = INVALID_REG_ADDR,
-};
-
-static u8 bq27530_regs[] = {
-       [BQ27XXX_REG_CTRL] = 0x00,
-       [BQ27XXX_REG_TEMP] = 0x06,
-       [BQ27XXX_REG_INT_TEMP] = 0x32,
-       [BQ27XXX_REG_VOLT] = 0x08,
-       [BQ27XXX_REG_AI] = 0x14,
-       [BQ27XXX_REG_FLAGS] = 0x0a,
-       [BQ27XXX_REG_TTE] = 0x16,
-       [BQ27XXX_REG_TTF] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_TTES] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_NAC] = 0x0c,
-       [BQ27XXX_REG_FCC] = 0x12,
-       [BQ27XXX_REG_CYCT] = 0x2a,
-       [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_SOC] = 0x2c,
-       [BQ27XXX_REG_DCAP] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_AP] = 0x24,
-};
-
-static u8 bq27541_regs[] = {
-       [BQ27XXX_REG_CTRL] = 0x00,
-       [BQ27XXX_REG_TEMP] = 0x06,
-       [BQ27XXX_REG_INT_TEMP] = 0x28,
-       [BQ27XXX_REG_VOLT] = 0x08,
-       [BQ27XXX_REG_AI] = 0x14,
-       [BQ27XXX_REG_FLAGS] = 0x0a,
-       [BQ27XXX_REG_TTE] = 0x16,
-       [BQ27XXX_REG_TTF] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_TTES] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_NAC] = 0x0c,
-       [BQ27XXX_REG_FCC] = 0x12,
-       [BQ27XXX_REG_CYCT] = 0x2a,
-       [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_SOC] = 0x2c,
-       [BQ27XXX_REG_DCAP] = 0x3c,
-       [BQ27XXX_REG_AP] = 0x24,
-};
-
-static u8 bq27545_regs[] = {
-       [BQ27XXX_REG_CTRL] = 0x00,
-       [BQ27XXX_REG_TEMP] = 0x06,
-       [BQ27XXX_REG_INT_TEMP] = 0x28,
-       [BQ27XXX_REG_VOLT] = 0x08,
-       [BQ27XXX_REG_AI] = 0x14,
-       [BQ27XXX_REG_FLAGS] = 0x0a,
-       [BQ27XXX_REG_TTE] = 0x16,
-       [BQ27XXX_REG_TTF] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_TTES] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_NAC] = 0x0c,
-       [BQ27XXX_REG_FCC] = 0x12,
-       [BQ27XXX_REG_CYCT] = 0x2a,
-       [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_SOC] = 0x2c,
-       [BQ27XXX_REG_DCAP] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_AP] = 0x24,
-};
-
-static u8 bq27421_regs[] = {
-       [BQ27XXX_REG_CTRL] = 0x00,
-       [BQ27XXX_REG_TEMP] = 0x02,
-       [BQ27XXX_REG_INT_TEMP] = 0x1e,
-       [BQ27XXX_REG_VOLT] = 0x04,
-       [BQ27XXX_REG_AI] = 0x10,
-       [BQ27XXX_REG_FLAGS] = 0x06,
-       [BQ27XXX_REG_TTE] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_TTF] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_TTES] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_NAC] = 0x08,
-       [BQ27XXX_REG_FCC] = 0x0e,
-       [BQ27XXX_REG_CYCT] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
-       [BQ27XXX_REG_SOC] = 0x1c,
-       [BQ27XXX_REG_DCAP] = 0x3c,
-       [BQ27XXX_REG_AP] = 0x18,
-};
-
-static u8 *bq27xxx_regs[] = {
-       [BQ27000] = bq27000_regs,
-       [BQ27010] = bq27010_regs,
-       [BQ27500] = bq27500_regs,
-       [BQ27530] = bq27530_regs,
-       [BQ27541] = bq27541_regs,
-       [BQ27545] = bq27545_regs,
-       [BQ27421] = bq27421_regs,
+static u8 bq27xxx_regs[][BQ27XXX_REG_MAX] = {
+       [BQ27000] = {
+               [BQ27XXX_REG_CTRL] = 0x00,
+               [BQ27XXX_REG_TEMP] = 0x06,
+               [BQ27XXX_REG_INT_TEMP] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_VOLT] = 0x08,
+               [BQ27XXX_REG_AI] = 0x14,
+               [BQ27XXX_REG_FLAGS] = 0x0a,
+               [BQ27XXX_REG_TTE] = 0x16,
+               [BQ27XXX_REG_TTF] = 0x18,
+               [BQ27XXX_REG_TTES] = 0x1c,
+               [BQ27XXX_REG_TTECP] = 0x26,
+               [BQ27XXX_REG_NAC] = 0x0c,
+               [BQ27XXX_REG_FCC] = 0x12,
+               [BQ27XXX_REG_CYCT] = 0x2a,
+               [BQ27XXX_REG_AE] = 0x22,
+               [BQ27XXX_REG_SOC] = 0x0b,
+               [BQ27XXX_REG_DCAP] = 0x76,
+               [BQ27XXX_REG_AP] = 0x24,
+       },
+       [BQ27010] = {
+               [BQ27XXX_REG_CTRL] = 0x00,
+               [BQ27XXX_REG_TEMP] = 0x06,
+               [BQ27XXX_REG_INT_TEMP] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_VOLT] = 0x08,
+               [BQ27XXX_REG_AI] = 0x14,
+               [BQ27XXX_REG_FLAGS] = 0x0a,
+               [BQ27XXX_REG_TTE] = 0x16,
+               [BQ27XXX_REG_TTF] = 0x18,
+               [BQ27XXX_REG_TTES] = 0x1c,
+               [BQ27XXX_REG_TTECP] = 0x26,
+               [BQ27XXX_REG_NAC] = 0x0c,
+               [BQ27XXX_REG_FCC] = 0x12,
+               [BQ27XXX_REG_CYCT] = 0x2a,
+               [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_SOC] = 0x0b,
+               [BQ27XXX_REG_DCAP] = 0x76,
+               [BQ27XXX_REG_AP] = INVALID_REG_ADDR,
+       },
+       [BQ27500] = {
+               [BQ27XXX_REG_CTRL] = 0x00,
+               [BQ27XXX_REG_TEMP] = 0x06,
+               [BQ27XXX_REG_INT_TEMP] = 0x28,
+               [BQ27XXX_REG_VOLT] = 0x08,
+               [BQ27XXX_REG_AI] = 0x14,
+               [BQ27XXX_REG_FLAGS] = 0x0a,
+               [BQ27XXX_REG_TTE] = 0x16,
+               [BQ27XXX_REG_TTF] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_TTES] = 0x1a,
+               [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_NAC] = 0x0c,
+               [BQ27XXX_REG_FCC] = 0x12,
+               [BQ27XXX_REG_CYCT] = 0x2a,
+               [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_SOC] = 0x2c,
+               [BQ27XXX_REG_DCAP] = 0x3c,
+               [BQ27XXX_REG_AP] = INVALID_REG_ADDR,
+       },
+       [BQ27530] = {
+               [BQ27XXX_REG_CTRL] = 0x00,
+               [BQ27XXX_REG_TEMP] = 0x06,
+               [BQ27XXX_REG_INT_TEMP] = 0x32,
+               [BQ27XXX_REG_VOLT] = 0x08,
+               [BQ27XXX_REG_AI] = 0x14,
+               [BQ27XXX_REG_FLAGS] = 0x0a,
+               [BQ27XXX_REG_TTE] = 0x16,
+               [BQ27XXX_REG_TTF] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_TTES] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_NAC] = 0x0c,
+               [BQ27XXX_REG_FCC] = 0x12,
+               [BQ27XXX_REG_CYCT] = 0x2a,
+               [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_SOC] = 0x2c,
+               [BQ27XXX_REG_DCAP] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_AP] = 0x24,
+       },
+       [BQ27541] = {
+               [BQ27XXX_REG_CTRL] = 0x00,
+               [BQ27XXX_REG_TEMP] = 0x06,
+               [BQ27XXX_REG_INT_TEMP] = 0x28,
+               [BQ27XXX_REG_VOLT] = 0x08,
+               [BQ27XXX_REG_AI] = 0x14,
+               [BQ27XXX_REG_FLAGS] = 0x0a,
+               [BQ27XXX_REG_TTE] = 0x16,
+               [BQ27XXX_REG_TTF] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_TTES] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_NAC] = 0x0c,
+               [BQ27XXX_REG_FCC] = 0x12,
+               [BQ27XXX_REG_CYCT] = 0x2a,
+               [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_SOC] = 0x2c,
+               [BQ27XXX_REG_DCAP] = 0x3c,
+               [BQ27XXX_REG_AP] = 0x24,
+       },
+       [BQ27545] = {
+               [BQ27XXX_REG_CTRL] = 0x00,
+               [BQ27XXX_REG_TEMP] = 0x06,
+               [BQ27XXX_REG_INT_TEMP] = 0x28,
+               [BQ27XXX_REG_VOLT] = 0x08,
+               [BQ27XXX_REG_AI] = 0x14,
+               [BQ27XXX_REG_FLAGS] = 0x0a,
+               [BQ27XXX_REG_TTE] = 0x16,
+               [BQ27XXX_REG_TTF] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_TTES] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_NAC] = 0x0c,
+               [BQ27XXX_REG_FCC] = 0x12,
+               [BQ27XXX_REG_CYCT] = 0x2a,
+               [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_SOC] = 0x2c,
+               [BQ27XXX_REG_DCAP] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_AP] = 0x24,
+       },
+       [BQ27421] = {
+               [BQ27XXX_REG_CTRL] = 0x00,
+               [BQ27XXX_REG_TEMP] = 0x02,
+               [BQ27XXX_REG_INT_TEMP] = 0x1e,
+               [BQ27XXX_REG_VOLT] = 0x04,
+               [BQ27XXX_REG_AI] = 0x10,
+               [BQ27XXX_REG_FLAGS] = 0x06,
+               [BQ27XXX_REG_TTE] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_TTF] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_TTES] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_NAC] = 0x08,
+               [BQ27XXX_REG_FCC] = 0x0e,
+               [BQ27XXX_REG_CYCT] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_SOC] = 0x1c,
+               [BQ27XXX_REG_DCAP] = 0x3c,
+               [BQ27XXX_REG_AP] = 0x18,
+       },
 };
 
 static enum power_supply_property bq27000_battery_props[] = {
@@ -735,11 +723,8 @@ static void bq27xxx_battery_poll(struct work_struct *work)
 
        bq27xxx_battery_update(di);
 
-       if (poll_interval > 0) {
-               /* The timer does not have to be accurate. */
-               set_timer_slack(&di->work.timer, poll_interval * HZ / 4);
+       if (poll_interval > 0)
                schedule_delayed_work(&di->work, poll_interval * HZ);
-       }
 }
 
 /*
Unnamed repository; edit this file 'description' to name the repository.