5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
310 lines
7.1 KiB
C
310 lines
7.1 KiB
C
/*
|
|
* max17040_battery.c
|
|
* fuel-gauge systems for lithium-ion (Li+) batteries
|
|
*
|
|
* Copyright (C) 2009 Samsung Electronics
|
|
* Minkyu Kang <mk7.kang@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 max17040_read_reg(struct i2c_client *client, int reg)
|
|
{
|
|
int ret;
|
|
|
|
ret = i2c_smbus_read_byte_data(client, reg);
|
|
|
|
if (ret < 0)
|
|
dev_err(&client->dev, "%s: err %d\n", __func__, ret);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void max17040_reset(struct i2c_client *client)
|
|
{
|
|
max17040_write_reg(client, MAX17040_CMD_MSB, 0x54);
|
|
max17040_write_reg(client, MAX17040_CMD_LSB, 0x00);
|
|
}
|
|
|
|
static void max17040_get_vcell(struct i2c_client *client)
|
|
{
|
|
struct max17040_chip *chip = i2c_get_clientdata(client);
|
|
u8 msb;
|
|
u8 lsb;
|
|
|
|
msb = max17040_read_reg(client, MAX17040_VCELL_MSB);
|
|
lsb = max17040_read_reg(client, MAX17040_VCELL_LSB);
|
|
|
|
chip->vcell = (msb << 4) + (lsb >> 4);
|
|
}
|
|
|
|
static void max17040_get_soc(struct i2c_client *client)
|
|
{
|
|
struct max17040_chip *chip = i2c_get_clientdata(client);
|
|
u8 msb;
|
|
u8 lsb;
|
|
|
|
msb = max17040_read_reg(client, MAX17040_SOC_MSB);
|
|
lsb = max17040_read_reg(client, MAX17040_SOC_LSB);
|
|
|
|
chip->soc = msb;
|
|
}
|
|
|
|
static void max17040_get_version(struct i2c_client *client)
|
|
{
|
|
u8 msb;
|
|
u8 lsb;
|
|
|
|
msb = max17040_read_reg(client, MAX17040_VER_MSB);
|
|
lsb = max17040_read_reg(client, MAX17040_VER_LSB);
|
|
|
|
dev_info(&client->dev, "MAX17040 Fuel-Gauge Ver %d%d\n", msb, lsb);
|
|
}
|
|
|
|
static void max17040_get_online(struct i2c_client *client)
|
|
{
|
|
struct max17040_chip *chip = i2c_get_clientdata(client);
|
|
|
|
if (chip->pdata->battery_online)
|
|
chip->online = chip->pdata->battery_online();
|
|
else
|
|
chip->online = 1;
|
|
}
|
|
|
|
static void max17040_get_status(struct i2c_client *client)
|
|
{
|
|
struct max17040_chip *chip = i2c_get_clientdata(client);
|
|
|
|
if (!chip->pdata->charger_online || !chip->pdata->charger_enable) {
|
|
chip->status = POWER_SUPPLY_STATUS_UNKNOWN;
|
|
return;
|
|
}
|
|
|
|
if (chip->pdata->charger_online()) {
|
|
if (chip->pdata->charger_enable())
|
|
chip->status = POWER_SUPPLY_STATUS_CHARGING;
|
|
else
|
|
chip->status = POWER_SUPPLY_STATUS_NOT_CHARGING;
|
|
} else {
|
|
chip->status = POWER_SUPPLY_STATUS_DISCHARGING;
|
|
}
|
|
|
|
if (chip->soc > MAX17040_BATTERY_FULL)
|
|
chip->status = POWER_SUPPLY_STATUS_FULL;
|
|
}
|
|
|
|
static void max17040_work(struct work_struct *work)
|
|
{
|
|
struct max17040_chip *chip;
|
|
|
|
chip = container_of(work, struct max17040_chip, work.work);
|
|
|
|
max17040_get_vcell(chip->client);
|
|
max17040_get_soc(chip->client);
|
|
max17040_get_online(chip->client);
|
|
max17040_get_status(chip->client);
|
|
|
|
schedule_delayed_work(&chip->work, MAX17040_DELAY);
|
|
}
|
|
|
|
static enum power_supply_property max17040_battery_props[] = {
|
|
POWER_SUPPLY_PROP_STATUS,
|
|
POWER_SUPPLY_PROP_ONLINE,
|
|
POWER_SUPPLY_PROP_VOLTAGE_NOW,
|
|
POWER_SUPPLY_PROP_CAPACITY,
|
|
};
|
|
|
|
static int __devinit max17040_probe(struct i2c_client *client,
|
|
const struct i2c_device_id *id)
|
|
{
|
|
struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
|
|
struct max17040_chip *chip;
|
|
int ret;
|
|
|
|
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE))
|
|
return -EIO;
|
|
|
|
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
|
|
if (!chip)
|
|
return -ENOMEM;
|
|
|
|
chip->client = client;
|
|
chip->pdata = client->dev.platform_data;
|
|
|
|
i2c_set_clientdata(client, chip);
|
|
|
|
chip->battery.name = "battery";
|
|
chip->battery.type = POWER_SUPPLY_TYPE_BATTERY;
|
|
chip->battery.get_property = max17040_get_property;
|
|
chip->battery.properties = max17040_battery_props;
|
|
chip->battery.num_properties = ARRAY_SIZE(max17040_battery_props);
|
|
|
|
ret = power_supply_register(&client->dev, &chip->battery);
|
|
if (ret) {
|
|
dev_err(&client->dev, "failed: power supply register\n");
|
|
i2c_set_clientdata(client, NULL);
|
|
kfree(chip);
|
|
return ret;
|
|
}
|
|
|
|
max17040_reset(client);
|
|
max17040_get_version(client);
|
|
|
|
INIT_DELAYED_WORK_DEFERRABLE(&chip->work, max17040_work);
|
|
schedule_delayed_work(&chip->work, MAX17040_DELAY);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __devexit max17040_remove(struct i2c_client *client)
|
|
{
|
|
struct max17040_chip *chip = i2c_get_clientdata(client);
|
|
|
|
power_supply_unregister(&chip->battery);
|
|
cancel_delayed_work(&chip->work);
|
|
i2c_set_clientdata(client, NULL);
|
|
kfree(chip);
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
static int max17040_suspend(struct i2c_client *client,
|
|
pm_message_t state)
|
|
{
|
|
struct max17040_chip *chip = i2c_get_clientdata(client);
|
|
|
|
cancel_delayed_work(&chip->work);
|
|
return 0;
|
|
}
|
|
|
|
static int max17040_resume(struct i2c_client *client)
|
|
{
|
|
struct max17040_chip *chip = i2c_get_clientdata(client);
|
|
|
|
schedule_delayed_work(&chip->work, MAX17040_DELAY);
|
|
return 0;
|
|
}
|
|
|
|
#else
|
|
|
|
#define max17040_suspend NULL
|
|
#define max17040_resume NULL
|
|
|
|
#endif /* CONFIG_PM */
|
|
|
|
static const struct i2c_device_id max17040_id[] = {
|
|
{ "max17040", 0 },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, max17040_id);
|
|
|
|
static struct i2c_driver max17040_i2c_driver = {
|
|
.driver = {
|
|
.name = "max17040",
|
|
},
|
|
.probe = max17040_probe,
|
|
.remove = __devexit_p(max17040_remove),
|
|
.suspend = max17040_suspend,
|
|
.resume = max17040_resume,
|
|
.id_table = max17040_id,
|
|
};
|
|
|
|
static int __init max17040_init(void)
|
|
{
|
|
return i2c_add_driver(&max17040_i2c_driver);
|
|
}
|
|
module_init(max17040_init);
|
|
|
|
static void __exit max17040_exit(void)
|
|
{
|
|
i2c_del_driver(&max17040_i2c_driver);
|
|
}
|
|
module_exit(max17040_exit);
|
|
|
|
MODULE_AUTHOR("Minkyu Kang <mk7.kang@samsung.com>");
|
|
MODULE_DESCRIPTION("MAX17040 Fuel Gauge");
|
|
MODULE_LICENSE("GPL");
|