microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

power_supply: bq27xxx_battery: Group register mappings into one table 

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>
Acked-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
This commit is contained in:
Andrew F. Davis 2016-06-17 17:02:35 -05:00 коммит произвёл Sebastian Reichel
Родитель 7a4f9830f0
Коммит 2e05b518c8
1 изменённых файлов: 136 добавлений и 148 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

284
drivers/power/bq27xxx_battery.c
Просмотреть файл

@ -82,6 +82,7 @@
* *
* These are indexes into a device's register mapping array. * These are indexes into a device's register mapping array.
*/ */
enum bq27xxx_reg_index { enum bq27xxx_reg_index {
BQ27XXX_REG_CTRL = 0, /* Control */ BQ27XXX_REG_CTRL = 0, /* Control */
BQ27XXX_REG_TEMP, /* Temperature */ BQ27XXX_REG_TEMP, /* Temperature */
@ -100,157 +101,144 @@ enum bq27xxx_reg_index {
BQ27XXX_REG_SOC, /* State-of-Charge */ BQ27XXX_REG_SOC, /* State-of-Charge */
BQ27XXX_REG_DCAP, /* Design Capacity */ BQ27XXX_REG_DCAP, /* Design Capacity */
BQ27XXX_REG_AP, /* Average Power */ BQ27XXX_REG_AP, /* Average Power */
BQ27XXX_REG_MAX, /* sentinel */
}; };
/* Register mappings */ /* Register mappings */
static u8 bq27000_regs[] = { static u8 bq27xxx_regs[][BQ27XXX_REG_MAX] = {
[BQ27XXX_REG_CTRL] = 0x00, [BQ27000] = {
[BQ27XXX_REG_TEMP] = 0x06, [BQ27XXX_REG_CTRL] = 0x00,
[BQ27XXX_REG_INT_TEMP] = INVALID_REG_ADDR, [BQ27XXX_REG_TEMP] = 0x06,
[BQ27XXX_REG_VOLT] = 0x08, [BQ27XXX_REG_INT_TEMP] = INVALID_REG_ADDR,
[BQ27XXX_REG_AI] = 0x14, [BQ27XXX_REG_VOLT] = 0x08,
[BQ27XXX_REG_FLAGS] = 0x0a, [BQ27XXX_REG_AI] = 0x14,
[BQ27XXX_REG_TTE] = 0x16, [BQ27XXX_REG_FLAGS] = 0x0a,
[BQ27XXX_REG_TTF] = 0x18, [BQ27XXX_REG_TTE] = 0x16,
[BQ27XXX_REG_TTES] = 0x1c, [BQ27XXX_REG_TTF] = 0x18,
[BQ27XXX_REG_TTECP] = 0x26, [BQ27XXX_REG_TTES] = 0x1c,
[BQ27XXX_REG_NAC] = 0x0c, [BQ27XXX_REG_TTECP] = 0x26,
[BQ27XXX_REG_FCC] = 0x12, [BQ27XXX_REG_NAC] = 0x0c,
[BQ27XXX_REG_CYCT] = 0x2a, [BQ27XXX_REG_FCC] = 0x12,
[BQ27XXX_REG_AE] = 0x22, [BQ27XXX_REG_CYCT] = 0x2a,
[BQ27XXX_REG_SOC] = 0x0b, [BQ27XXX_REG_AE] = 0x22,
[BQ27XXX_REG_DCAP] = 0x76, [BQ27XXX_REG_SOC] = 0x0b,
[BQ27XXX_REG_AP] = 0x24, [BQ27XXX_REG_DCAP] = 0x76,
}; [BQ27XXX_REG_AP] = 0x24,
},
static u8 bq27010_regs[] = { [BQ27010] = {
[BQ27XXX_REG_CTRL] = 0x00, [BQ27XXX_REG_CTRL] = 0x00,
[BQ27XXX_REG_TEMP] = 0x06, [BQ27XXX_REG_TEMP] = 0x06,
[BQ27XXX_REG_INT_TEMP] = INVALID_REG_ADDR, [BQ27XXX_REG_INT_TEMP] = INVALID_REG_ADDR,
[BQ27XXX_REG_VOLT] = 0x08, [BQ27XXX_REG_VOLT] = 0x08,
[BQ27XXX_REG_AI] = 0x14, [BQ27XXX_REG_AI] = 0x14,
[BQ27XXX_REG_FLAGS] = 0x0a, [BQ27XXX_REG_FLAGS] = 0x0a,
[BQ27XXX_REG_TTE] = 0x16, [BQ27XXX_REG_TTE] = 0x16,
[BQ27XXX_REG_TTF] = 0x18, [BQ27XXX_REG_TTF] = 0x18,
[BQ27XXX_REG_TTES] = 0x1c, [BQ27XXX_REG_TTES] = 0x1c,
[BQ27XXX_REG_TTECP] = 0x26, [BQ27XXX_REG_TTECP] = 0x26,
[BQ27XXX_REG_NAC] = 0x0c, [BQ27XXX_REG_NAC] = 0x0c,
[BQ27XXX_REG_FCC] = 0x12, [BQ27XXX_REG_FCC] = 0x12,
[BQ27XXX_REG_CYCT] = 0x2a, [BQ27XXX_REG_CYCT] = 0x2a,
[BQ27XXX_REG_AE] = INVALID_REG_ADDR, [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
[BQ27XXX_REG_SOC] = 0x0b, [BQ27XXX_REG_SOC] = 0x0b,
[BQ27XXX_REG_DCAP] = 0x76, [BQ27XXX_REG_DCAP] = 0x76,
[BQ27XXX_REG_AP] = INVALID_REG_ADDR, [BQ27XXX_REG_AP] = INVALID_REG_ADDR,
}; },
[BQ27500] = {
static u8 bq27500_regs[] = { [BQ27XXX_REG_CTRL] = 0x00,
[BQ27XXX_REG_CTRL] = 0x00, [BQ27XXX_REG_TEMP] = 0x06,
[BQ27XXX_REG_TEMP] = 0x06, [BQ27XXX_REG_INT_TEMP] = 0x28,
[BQ27XXX_REG_INT_TEMP] = 0x28, [BQ27XXX_REG_VOLT] = 0x08,
[BQ27XXX_REG_VOLT] = 0x08, [BQ27XXX_REG_AI] = 0x14,
[BQ27XXX_REG_AI] = 0x14, [BQ27XXX_REG_FLAGS] = 0x0a,
[BQ27XXX_REG_FLAGS] = 0x0a, [BQ27XXX_REG_TTE] = 0x16,
[BQ27XXX_REG_TTE] = 0x16, [BQ27XXX_REG_TTF] = INVALID_REG_ADDR,
[BQ27XXX_REG_TTF] = INVALID_REG_ADDR, [BQ27XXX_REG_TTES] = 0x1a,
[BQ27XXX_REG_TTES] = 0x1a, [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
[BQ27XXX_REG_TTECP] = INVALID_REG_ADDR, [BQ27XXX_REG_NAC] = 0x0c,
[BQ27XXX_REG_NAC] = 0x0c, [BQ27XXX_REG_FCC] = 0x12,
[BQ27XXX_REG_FCC] = 0x12, [BQ27XXX_REG_CYCT] = 0x2a,
[BQ27XXX_REG_CYCT] = 0x2a, [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
[BQ27XXX_REG_AE] = INVALID_REG_ADDR, [BQ27XXX_REG_SOC] = 0x2c,
[BQ27XXX_REG_SOC] = 0x2c, [BQ27XXX_REG_DCAP] = 0x3c,
[BQ27XXX_REG_DCAP] = 0x3c, [BQ27XXX_REG_AP] = INVALID_REG_ADDR,
[BQ27XXX_REG_AP] = INVALID_REG_ADDR, },
}; [BQ27530] = {
[BQ27XXX_REG_CTRL] = 0x00,
static u8 bq27530_regs[] = { [BQ27XXX_REG_TEMP] = 0x06,
[BQ27XXX_REG_CTRL] = 0x00, [BQ27XXX_REG_INT_TEMP] = 0x32,
[BQ27XXX_REG_TEMP] = 0x06, [BQ27XXX_REG_VOLT] = 0x08,
[BQ27XXX_REG_INT_TEMP] = 0x32, [BQ27XXX_REG_AI] = 0x14,
[BQ27XXX_REG_VOLT] = 0x08, [BQ27XXX_REG_FLAGS] = 0x0a,
[BQ27XXX_REG_AI] = 0x14, [BQ27XXX_REG_TTE] = 0x16,
[BQ27XXX_REG_FLAGS] = 0x0a, [BQ27XXX_REG_TTF] = INVALID_REG_ADDR,
[BQ27XXX_REG_TTE] = 0x16, [BQ27XXX_REG_TTES] = INVALID_REG_ADDR,
[BQ27XXX_REG_TTF] = INVALID_REG_ADDR, [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
[BQ27XXX_REG_TTES] = INVALID_REG_ADDR, [BQ27XXX_REG_NAC] = 0x0c,
[BQ27XXX_REG_TTECP] = INVALID_REG_ADDR, [BQ27XXX_REG_FCC] = 0x12,
[BQ27XXX_REG_NAC] = 0x0c, [BQ27XXX_REG_CYCT] = 0x2a,
[BQ27XXX_REG_FCC] = 0x12, [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
[BQ27XXX_REG_CYCT] = 0x2a, [BQ27XXX_REG_SOC] = 0x2c,
[BQ27XXX_REG_AE] = INVALID_REG_ADDR, [BQ27XXX_REG_DCAP] = INVALID_REG_ADDR,
[BQ27XXX_REG_SOC] = 0x2c, [BQ27XXX_REG_AP] = 0x24,
[BQ27XXX_REG_DCAP] = INVALID_REG_ADDR, },
[BQ27XXX_REG_AP] = 0x24, [BQ27541] = {
}; [BQ27XXX_REG_CTRL] = 0x00,
[BQ27XXX_REG_TEMP] = 0x06,
static u8 bq27541_regs[] = { [BQ27XXX_REG_INT_TEMP] = 0x28,
[BQ27XXX_REG_CTRL] = 0x00, [BQ27XXX_REG_VOLT] = 0x08,
[BQ27XXX_REG_TEMP] = 0x06, [BQ27XXX_REG_AI] = 0x14,
[BQ27XXX_REG_INT_TEMP] = 0x28, [BQ27XXX_REG_FLAGS] = 0x0a,
[BQ27XXX_REG_VOLT] = 0x08, [BQ27XXX_REG_TTE] = 0x16,
[BQ27XXX_REG_AI] = 0x14, [BQ27XXX_REG_TTF] = INVALID_REG_ADDR,
[BQ27XXX_REG_FLAGS] = 0x0a, [BQ27XXX_REG_TTES] = INVALID_REG_ADDR,
[BQ27XXX_REG_TTE] = 0x16, [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
[BQ27XXX_REG_TTF] = INVALID_REG_ADDR, [BQ27XXX_REG_NAC] = 0x0c,
[BQ27XXX_REG_TTES] = INVALID_REG_ADDR, [BQ27XXX_REG_FCC] = 0x12,
[BQ27XXX_REG_TTECP] = INVALID_REG_ADDR, [BQ27XXX_REG_CYCT] = 0x2a,
[BQ27XXX_REG_NAC] = 0x0c, [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
[BQ27XXX_REG_FCC] = 0x12, [BQ27XXX_REG_SOC] = 0x2c,
[BQ27XXX_REG_CYCT] = 0x2a, [BQ27XXX_REG_DCAP] = 0x3c,
[BQ27XXX_REG_AE] = INVALID_REG_ADDR, [BQ27XXX_REG_AP] = 0x24,
[BQ27XXX_REG_SOC] = 0x2c, },
[BQ27XXX_REG_DCAP] = 0x3c, [BQ27545] = {
[BQ27XXX_REG_AP] = 0x24, [BQ27XXX_REG_CTRL] = 0x00,
}; [BQ27XXX_REG_TEMP] = 0x06,
[BQ27XXX_REG_INT_TEMP] = 0x28,
static u8 bq27545_regs[] = { [BQ27XXX_REG_VOLT] = 0x08,
[BQ27XXX_REG_CTRL] = 0x00, [BQ27XXX_REG_AI] = 0x14,
[BQ27XXX_REG_TEMP] = 0x06, [BQ27XXX_REG_FLAGS] = 0x0a,
[BQ27XXX_REG_INT_TEMP] = 0x28, [BQ27XXX_REG_TTE] = 0x16,
[BQ27XXX_REG_VOLT] = 0x08, [BQ27XXX_REG_TTF] = INVALID_REG_ADDR,
[BQ27XXX_REG_AI] = 0x14, [BQ27XXX_REG_TTES] = INVALID_REG_ADDR,
[BQ27XXX_REG_FLAGS] = 0x0a, [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
[BQ27XXX_REG_TTE] = 0x16, [BQ27XXX_REG_NAC] = 0x0c,
[BQ27XXX_REG_TTF] = INVALID_REG_ADDR, [BQ27XXX_REG_FCC] = 0x12,
[BQ27XXX_REG_TTES] = INVALID_REG_ADDR, [BQ27XXX_REG_CYCT] = 0x2a,
[BQ27XXX_REG_TTECP] = INVALID_REG_ADDR, [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
[BQ27XXX_REG_NAC] = 0x0c, [BQ27XXX_REG_SOC] = 0x2c,
[BQ27XXX_REG_FCC] = 0x12, [BQ27XXX_REG_DCAP] = INVALID_REG_ADDR,
[BQ27XXX_REG_CYCT] = 0x2a, [BQ27XXX_REG_AP] = 0x24,
[BQ27XXX_REG_AE] = INVALID_REG_ADDR, },
[BQ27XXX_REG_SOC] = 0x2c, [BQ27421] = {
[BQ27XXX_REG_DCAP] = INVALID_REG_ADDR, [BQ27XXX_REG_CTRL] = 0x00,
[BQ27XXX_REG_AP] = 0x24, [BQ27XXX_REG_TEMP] = 0x02,
}; [BQ27XXX_REG_INT_TEMP] = 0x1e,
[BQ27XXX_REG_VOLT] = 0x04,
static u8 bq27421_regs[] = { [BQ27XXX_REG_AI] = 0x10,
[BQ27XXX_REG_CTRL] = 0x00, [BQ27XXX_REG_FLAGS] = 0x06,
[BQ27XXX_REG_TEMP] = 0x02, [BQ27XXX_REG_TTE] = INVALID_REG_ADDR,
[BQ27XXX_REG_INT_TEMP] = 0x1e, [BQ27XXX_REG_TTF] = INVALID_REG_ADDR,
[BQ27XXX_REG_VOLT] = 0x04, [BQ27XXX_REG_TTES] = INVALID_REG_ADDR,
[BQ27XXX_REG_AI] = 0x10, [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
[BQ27XXX_REG_FLAGS] = 0x06, [BQ27XXX_REG_NAC] = 0x08,
[BQ27XXX_REG_TTE] = INVALID_REG_ADDR, [BQ27XXX_REG_FCC] = 0x0e,
[BQ27XXX_REG_TTF] = INVALID_REG_ADDR, [BQ27XXX_REG_CYCT] = INVALID_REG_ADDR,
[BQ27XXX_REG_TTES] = INVALID_REG_ADDR, [BQ27XXX_REG_AE] = INVALID_REG_ADDR,
[BQ27XXX_REG_TTECP] = INVALID_REG_ADDR, [BQ27XXX_REG_SOC] = 0x1c,
[BQ27XXX_REG_NAC] = 0x08, [BQ27XXX_REG_DCAP] = 0x3c,
[BQ27XXX_REG_FCC] = 0x0e, [BQ27XXX_REG_AP] = 0x18,
[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 enum power_supply_property bq27000_battery_props[] = { static enum power_supply_property bq27000_battery_props[] = {