[PATCH v2 3/3] power_supply: modelgauge_battery: Remove Maxim MAX17040 gauge
Remove Maxim MAX17040 gauge driver since it is superseded by full-functional Maxim ModelGauge ICs gauge driver for MAX17040/41/43/44/48/49/58/59 chips Signed-off-by: Vladimir Barinov --- drivers/power/Kconfig|8 - drivers/power/Makefile |1 drivers/power/max17040_battery.c | 297 --- include/linux/max17040_battery.h | 19 -- 4 files changed, 325 deletions(-) Index: linux-2.6.torvalds/drivers/power/Kconfig === --- linux-2.6.torvalds.orig/drivers/power/Kconfig 2014-02-02 01:37:35.374626307 +0400 +++ linux-2.6.torvalds/drivers/power/Kconfig2014-02-02 01:38:21.966627415 +0400 @@ -185,14 +185,6 @@ Say Y here to enable support for batteries charger integrated into DA9052 PMIC. -config BATTERY_MAX17040 - tristate "Maxim MAX17040 Fuel Gauge" - depends on I2C - help - MAX17040 is fuel-gauge systems for lithium-ion (Li+) batteries - in handheld and portable equipment. The MAX17040 is configured - to operate with a single lithium cell - config BATTERY_MAX17042 tristate "Maxim MAX17042/17047/17050/8997/8966 Fuel Gauge" depends on I2C Index: linux-2.6.torvalds/drivers/power/Makefile === --- linux-2.6.torvalds.orig/drivers/power/Makefile 2014-02-02 01:37:35.0 +0400 +++ linux-2.6.torvalds/drivers/power/Makefile 2014-02-02 01:38:21.966627415 +0400 @@ -30,7 +30,6 @@ obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o obj-$(CONFIG_BATTERY_DA9052) += da9052-battery.o -obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o obj-$(CONFIG_BATTERY_MAX17042) += max17042_battery.o obj-$(CONFIG_BATTERY_MODELGAUGE) += modelgauge_battery.o obj-$(CONFIG_BATTERY_Z2) += z2_battery.o Index: linux-2.6.torvalds/drivers/power/max17040_battery.c === --- linux-2.6.torvalds.orig/drivers/power/max17040_battery.c2014-02-02 01:38:29.614627597 +0400 +++ /dev/null 1970-01-01 00:00:00.0 + @@ -1,297 +0,0 @@ -/* - * max17040_battery.c - * fuel-gauge systems for lithium-ion (Li+) batteries - * - * Copyright (C) 2009 Samsung Electronics - * Minkyu Kang - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define MAX17040_VCELL_MSB 0x02 -#define MAX17040_VCELL_LSB 0x03 -#define MAX17040_SOC_MSB 0x04 -#define MAX17040_SOC_LSB 0x05 -#define MAX17040_MODE_MSB 0x06 -#define MAX17040_MODE_LSB 0x07 -#define MAX17040_VER_MSB 0x08 -#define MAX17040_VER_LSB 0x09 -#define MAX17040_RCOMP_MSB 0x0C -#define MAX17040_RCOMP_LSB 0x0D -#define MAX17040_CMD_MSB 0xFE -#define MAX17040_CMD_LSB 0xFF - -#define MAX17040_DELAY 1000 -#define MAX17040_BATTERY_FULL 95 - -struct max17040_chip { - struct i2c_client *client; - struct delayed_work work; - struct power_supply battery; - struct max17040_platform_data *pdata; - - /* State Of Connect */ - int online; - /* battery voltage */ - int vcell; - /* battery capacity */ - int soc; - /* State Of Charge */ - int status; -}; - -static int max17040_get_property(struct power_supply *psy, - enum power_supply_property psp, - union power_supply_propval *val) -{ - struct max17040_chip *chip = container_of(psy, - struct max17040_chip, battery); - - switch (psp) { - case POWER_SUPPLY_PROP_STATUS: - val->intval = chip->status; - break; - case POWER_SUPPLY_PROP_ONLINE: - val->intval = chip->online; - break; - case POWER_SUPPLY_PROP_VOLTAGE_NOW: - val->intval = chip->vcell; - break; - case POWER_SUPPLY_PROP_CAPACITY: - val->intval = chip->soc; - break; - default: - return -EINVAL; - } - return 0; -} - -static int max17040_write_reg(struct i2c_client *client, int reg, u8 value) -{ - int ret; - - ret = i2c_smbus_write_byte_data(client, reg, value); - - if (ret < 0) - dev_err(>dev, "%s: err %d\n", __func__, ret); - - return ret; -} - -static int max17040_read_reg(struct i2c_client *client, int reg) -{ - int ret; - - ret = i2c_smbus_read_byte_data(client, reg); - - if (ret < 0) - dev_err(>dev, "%s: err %d\n", __func__, ret);
[PATCH v2 3/3] power_supply: modelgauge_battery: Remove Maxim MAX17040 gauge
Remove Maxim MAX17040 gauge driver since it is superseded by full-functional Maxim ModelGauge ICs gauge driver for MAX17040/41/43/44/48/49/58/59 chips Signed-off-by: Vladimir Barinov vladimir.bari...@cogentembedded.com --- drivers/power/Kconfig|8 - drivers/power/Makefile |1 drivers/power/max17040_battery.c | 297 --- include/linux/max17040_battery.h | 19 -- 4 files changed, 325 deletions(-) Index: linux-2.6.torvalds/drivers/power/Kconfig === --- linux-2.6.torvalds.orig/drivers/power/Kconfig 2014-02-02 01:37:35.374626307 +0400 +++ linux-2.6.torvalds/drivers/power/Kconfig2014-02-02 01:38:21.966627415 +0400 @@ -185,14 +185,6 @@ Say Y here to enable support for batteries charger integrated into DA9052 PMIC. -config BATTERY_MAX17040 - tristate Maxim MAX17040 Fuel Gauge - depends on I2C - help - MAX17040 is fuel-gauge systems for lithium-ion (Li+) batteries - in handheld and portable equipment. The MAX17040 is configured - to operate with a single lithium cell - config BATTERY_MAX17042 tristate Maxim MAX17042/17047/17050/8997/8966 Fuel Gauge depends on I2C Index: linux-2.6.torvalds/drivers/power/Makefile === --- linux-2.6.torvalds.orig/drivers/power/Makefile 2014-02-02 01:37:35.0 +0400 +++ linux-2.6.torvalds/drivers/power/Makefile 2014-02-02 01:38:21.966627415 +0400 @@ -30,7 +30,6 @@ obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o obj-$(CONFIG_BATTERY_DA9052) += da9052-battery.o -obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o obj-$(CONFIG_BATTERY_MAX17042) += max17042_battery.o obj-$(CONFIG_BATTERY_MODELGAUGE) += modelgauge_battery.o obj-$(CONFIG_BATTERY_Z2) += z2_battery.o Index: linux-2.6.torvalds/drivers/power/max17040_battery.c === --- linux-2.6.torvalds.orig/drivers/power/max17040_battery.c2014-02-02 01:38:29.614627597 +0400 +++ /dev/null 1970-01-01 00:00:00.0 + @@ -1,297 +0,0 @@ -/* - * max17040_battery.c - * fuel-gauge systems for lithium-ion (Li+) batteries - * - * Copyright (C) 2009 Samsung Electronics - * Minkyu Kang mk7.k...@samsung.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#include linux/module.h -#include linux/init.h -#include linux/platform_device.h -#include linux/mutex.h -#include linux/err.h -#include linux/i2c.h -#include linux/delay.h -#include linux/power_supply.h -#include linux/max17040_battery.h -#include linux/slab.h - -#define MAX17040_VCELL_MSB 0x02 -#define MAX17040_VCELL_LSB 0x03 -#define MAX17040_SOC_MSB 0x04 -#define MAX17040_SOC_LSB 0x05 -#define MAX17040_MODE_MSB 0x06 -#define MAX17040_MODE_LSB 0x07 -#define MAX17040_VER_MSB 0x08 -#define MAX17040_VER_LSB 0x09 -#define MAX17040_RCOMP_MSB 0x0C -#define MAX17040_RCOMP_LSB 0x0D -#define MAX17040_CMD_MSB 0xFE -#define MAX17040_CMD_LSB 0xFF - -#define MAX17040_DELAY 1000 -#define MAX17040_BATTERY_FULL 95 - -struct max17040_chip { - struct i2c_client *client; - struct delayed_work work; - struct power_supply battery; - struct max17040_platform_data *pdata; - - /* State Of Connect */ - int online; - /* battery voltage */ - int vcell; - /* battery capacity */ - int soc; - /* State Of Charge */ - int status; -}; - -static int max17040_get_property(struct power_supply *psy, - enum power_supply_property psp, - union power_supply_propval *val) -{ - struct max17040_chip *chip = container_of(psy, - struct max17040_chip, battery); - - switch (psp) { - case POWER_SUPPLY_PROP_STATUS: - val-intval = chip-status; - break; - case POWER_SUPPLY_PROP_ONLINE: - val-intval = chip-online; - break; - case POWER_SUPPLY_PROP_VOLTAGE_NOW: - val-intval = chip-vcell; - break; - case POWER_SUPPLY_PROP_CAPACITY: - val-intval = chip-soc; - break; - default: - return -EINVAL; - } - return 0; -} - -static int max17040_write_reg(struct i2c_client *client, int reg, u8 value) -{ - int ret; - - ret = i2c_smbus_write_byte_data(client, reg, value); - - if (ret 0) - dev_err(client-dev, %s: err %d\n, __func__, ret); - - return ret; -} - -static int