Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1410532 > unrolled thread

[PATCH 3/3] power_supply: bq27xxx_battery: Group register mappings into one table

Started by"Andrew F. Davis" <afd@ti.com>
First post2016-05-31 20:50 +0200
Last post2016-06-10 03:30 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 3/3] power_supply: bq27xxx_battery: Group register mappings into one table "Andrew F. Davis" <afd@ti.com> - 2016-05-31 20:50 +0200
    Re: [PATCH 3/3] power_supply: bq27xxx_battery: Group register  mappings into one table Sebastian Reichel <sre@kernel.org> - 2016-06-10 03:30 +0200

#1410532 — [PATCH 3/3] power_supply: bq27xxx_battery: Group register mappings into one table

From"Andrew F. Davis" <afd@ti.com>
Date2016-05-31 20:50 +0200
Subject[PATCH 3/3] power_supply: bq27xxx_battery: Group register mappings into one table
Message-ID<rEWTM-6iC-37@gated-at.bofh.it>
Currently for each device with a unique register map we have a named
array that we then merge into a multidimensional array. Skip this
middle step and apply the register arrays directly to the multi-array.

Signed-off-by: Andrew F. Davis <afd@ti.com>
---
 drivers/power/bq27xxx_battery.c | 281 +++++++++++++++++++---------------------
 1 file changed, 134 insertions(+), 147 deletions(-)

diff --git a/drivers/power/bq27xxx_battery.c b/drivers/power/bq27xxx_battery.c
index 01737fa..c954e6d 100644
--- 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 */
@@ -103,154 +104,140 @@ enum bq27xxx_reg_index {
 };
 
 /* 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,
+	[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[] = {
-- 
2.8.3

[toc] | [next] | [standalone]

#1418980 — Re: [PATCH 3/3] power_supply: bq27xxx_battery: Group register mappings into one table

FromSebastian Reichel <sre@kernel.org>
Date2016-06-10 03:30 +0200
SubjectRe: [PATCH 3/3] power_supply: bq27xxx_battery: Group register mappings into one table
Message-ID<rIjqO-6ed-27@gated-at.bofh.it>
In reply to#1410532

[Multipart message — attachments visible in raw view] — view raw

Hi,

On Tue, May 31, 2016 at 01:45:00PM -0500, Andrew F. Davis wrote:
> Currently for each device with a unique register map we have a named
> array that we then merge into a multidimensional array. Skip this
> middle step and apply the register arrays directly to the multi-array.

I applied the first two patches, but the third (this one) does not
compile for me:

  CC [M]  drivers/power/bq27xxx_battery.o
drivers/power/bq27xxx_battery.c:108:2: warning: braces around scalar initializer
  [BQ27000] = {
  ^
drivers/power/bq27xxx_battery.c:108:2: note: (near initialization for ‘bq27xxx_regs[1]’)
drivers/power/bq27xxx_battery.c:109:4: error: array index in non-array initializer
   [BQ27XXX_REG_CTRL] = 0x00,
    ^
drivers/power/bq27xxx_battery.c:109:4: note: (near initialization for ‘bq27xxx_regs[1]’)
drivers/power/bq27xxx_battery.c:110:4: error: array index in non-array initializer
   [BQ27XXX_REG_TEMP] = 0x06,
    ^
...

-- Sebastian

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web