mirror of
https://github.com/torvalds/linux.git
synced 2024-10-31 01:01:52 +00:00
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>
285 lines
7.3 KiB
C
285 lines
7.3 KiB
C
/*
|
|
* max1586.c -- Voltage and current regulation for the Maxim 1586
|
|
*
|
|
* Copyright (C) 2008 Robert Jarzmik
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
#include <linux/module.h>
|
|
#include <linux/err.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/regulator/driver.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/regulator/max1586.h>
|
|
|
|
#define MAX1586_V3_MAX_VSEL 31
|
|
#define MAX1586_V6_MAX_VSEL 3
|
|
|
|
#define MAX1586_V3_MIN_UV 700000
|
|
#define MAX1586_V3_MAX_UV 1475000
|
|
|
|
#define MAX1586_V6_MIN_UV 0
|
|
#define MAX1586_V6_MAX_UV 3000000
|
|
|
|
#define I2C_V3_SELECT (0 << 5)
|
|
#define I2C_V6_SELECT (1 << 5)
|
|
|
|
struct max1586_data {
|
|
struct i2c_client *client;
|
|
|
|
/* min/max V3 voltage */
|
|
unsigned int min_uV;
|
|
unsigned int max_uV;
|
|
|
|
struct regulator_dev *rdev[0];
|
|
};
|
|
|
|
/*
|
|
* V3 voltage
|
|
* On I2C bus, sending a "x" byte to the max1586 means :
|
|
* set V3 to 0.700V + (x & 0x1f) * 0.025V
|
|
* This voltage can be increased by external resistors
|
|
* R24 and R25=100kOhm as described in the data sheet.
|
|
* The gain is approximately: 1 + R24/R25 + R24/185.5kOhm
|
|
*/
|
|
static int max1586_v3_calc_voltage(struct max1586_data *max1586,
|
|
unsigned selector)
|
|
{
|
|
unsigned range_uV = max1586->max_uV - max1586->min_uV;
|
|
|
|
return max1586->min_uV + (selector * range_uV / MAX1586_V3_MAX_VSEL);
|
|
}
|
|
|
|
static int max1586_v3_set(struct regulator_dev *rdev, int min_uV, int max_uV)
|
|
{
|
|
struct max1586_data *max1586 = rdev_get_drvdata(rdev);
|
|
struct i2c_client *client = max1586->client;
|
|
unsigned range_uV = max1586->max_uV - max1586->min_uV;
|
|
unsigned selector;
|
|
u8 v3_prog;
|
|
|
|
if (min_uV > max1586->max_uV || max_uV < max1586->min_uV)
|
|
return -EINVAL;
|
|
if (min_uV < max1586->min_uV)
|
|
min_uV = max1586->min_uV;
|
|
|
|
selector = ((min_uV - max1586->min_uV) * MAX1586_V3_MAX_VSEL +
|
|
range_uV - 1) / range_uV;
|
|
if (max1586_v3_calc_voltage(max1586, selector) > max_uV)
|
|
return -EINVAL;
|
|
|
|
dev_dbg(&client->dev, "changing voltage v3 to %dmv\n",
|
|
max1586_v3_calc_voltage(max1586, selector) / 1000);
|
|
|
|
v3_prog = I2C_V3_SELECT | (u8) selector;
|
|
return i2c_smbus_write_byte(client, v3_prog);
|
|
}
|
|
|
|
static int max1586_v3_list(struct regulator_dev *rdev, unsigned selector)
|
|
{
|
|
struct max1586_data *max1586 = rdev_get_drvdata(rdev);
|
|
|
|
if (selector > MAX1586_V3_MAX_VSEL)
|
|
return -EINVAL;
|
|
return max1586_v3_calc_voltage(max1586, selector);
|
|
}
|
|
|
|
/*
|
|
* V6 voltage
|
|
* On I2C bus, sending a "x" byte to the max1586 means :
|
|
* set V6 to either 0V, 1.8V, 2.5V, 3V depending on (x & 0x3)
|
|
* As regulator framework doesn't accept voltages to be 0V, we use 1uV.
|
|
*/
|
|
static int max1586_v6_calc_voltage(unsigned selector)
|
|
{
|
|
static int voltages_uv[] = { 1, 1800000, 2500000, 3000000 };
|
|
|
|
return voltages_uv[selector];
|
|
}
|
|
|
|
static int max1586_v6_set(struct regulator_dev *rdev, int min_uV, int max_uV)
|
|
{
|
|
struct i2c_client *client = rdev_get_drvdata(rdev);
|
|
unsigned selector;
|
|
u8 v6_prog;
|
|
|
|
if (min_uV < MAX1586_V6_MIN_UV || min_uV > MAX1586_V6_MAX_UV)
|
|
return -EINVAL;
|
|
if (max_uV < MAX1586_V6_MIN_UV || max_uV > MAX1586_V6_MAX_UV)
|
|
return -EINVAL;
|
|
|
|
if (min_uV >= 3000000)
|
|
selector = 3;
|
|
if (min_uV < 3000000)
|
|
selector = 2;
|
|
if (min_uV < 2500000)
|
|
selector = 1;
|
|
if (min_uV < 1800000)
|
|
selector = 0;
|
|
|
|
if (max1586_v6_calc_voltage(selector) > max_uV)
|
|
return -EINVAL;
|
|
|
|
dev_dbg(&client->dev, "changing voltage v6 to %dmv\n",
|
|
max1586_v6_calc_voltage(selector) / 1000);
|
|
|
|
v6_prog = I2C_V6_SELECT | (u8) selector;
|
|
return i2c_smbus_write_byte(client, v6_prog);
|
|
}
|
|
|
|
static int max1586_v6_list(struct regulator_dev *rdev, unsigned selector)
|
|
{
|
|
if (selector > MAX1586_V6_MAX_VSEL)
|
|
return -EINVAL;
|
|
return max1586_v6_calc_voltage(selector);
|
|
}
|
|
|
|
/*
|
|
* The Maxim 1586 controls V3 and V6 voltages, but offers no way of reading back
|
|
* the set up value.
|
|
*/
|
|
static struct regulator_ops max1586_v3_ops = {
|
|
.set_voltage = max1586_v3_set,
|
|
.list_voltage = max1586_v3_list,
|
|
};
|
|
|
|
static struct regulator_ops max1586_v6_ops = {
|
|
.set_voltage = max1586_v6_set,
|
|
.list_voltage = max1586_v6_list,
|
|
};
|
|
|
|
static struct regulator_desc max1586_reg[] = {
|
|
{
|
|
.name = "Output_V3",
|
|
.id = MAX1586_V3,
|
|
.ops = &max1586_v3_ops,
|
|
.type = REGULATOR_VOLTAGE,
|
|
.n_voltages = MAX1586_V3_MAX_VSEL + 1,
|
|
.owner = THIS_MODULE,
|
|
},
|
|
{
|
|
.name = "Output_V6",
|
|
.id = MAX1586_V6,
|
|
.ops = &max1586_v6_ops,
|
|
.type = REGULATOR_VOLTAGE,
|
|
.n_voltages = MAX1586_V6_MAX_VSEL + 1,
|
|
.owner = THIS_MODULE,
|
|
},
|
|
};
|
|
|
|
static int __devinit max1586_pmic_probe(struct i2c_client *client,
|
|
const struct i2c_device_id *i2c_id)
|
|
{
|
|
struct regulator_dev **rdev;
|
|
struct max1586_platform_data *pdata = client->dev.platform_data;
|
|
struct max1586_data *max1586;
|
|
int i, id, ret = -ENOMEM;
|
|
|
|
max1586 = kzalloc(sizeof(struct max1586_data) +
|
|
sizeof(struct regulator_dev *) * (MAX1586_V6 + 1),
|
|
GFP_KERNEL);
|
|
if (!max1586)
|
|
goto out;
|
|
|
|
max1586->client = client;
|
|
|
|
if (!pdata->v3_gain) {
|
|
ret = -EINVAL;
|
|
goto out_unmap;
|
|
}
|
|
max1586->min_uV = MAX1586_V3_MIN_UV / 1000 * pdata->v3_gain / 1000;
|
|
max1586->max_uV = MAX1586_V3_MAX_UV / 1000 * pdata->v3_gain / 1000;
|
|
|
|
rdev = max1586->rdev;
|
|
for (i = 0; i < pdata->num_subdevs && i <= MAX1586_V6; i++) {
|
|
id = pdata->subdevs[i].id;
|
|
if (!pdata->subdevs[i].platform_data)
|
|
continue;
|
|
if (id < MAX1586_V3 || id > MAX1586_V6) {
|
|
dev_err(&client->dev, "invalid regulator id %d\n", id);
|
|
goto err;
|
|
}
|
|
rdev[i] = regulator_register(&max1586_reg[id], &client->dev,
|
|
pdata->subdevs[i].platform_data,
|
|
max1586);
|
|
if (IS_ERR(rdev[i])) {
|
|
ret = PTR_ERR(rdev[i]);
|
|
dev_err(&client->dev, "failed to register %s\n",
|
|
max1586_reg[id].name);
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
i2c_set_clientdata(client, rdev);
|
|
dev_info(&client->dev, "Maxim 1586 regulator driver loaded\n");
|
|
return 0;
|
|
|
|
err:
|
|
while (--i >= 0)
|
|
regulator_unregister(rdev[i]);
|
|
out_unmap:
|
|
kfree(max1586);
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
static int __devexit max1586_pmic_remove(struct i2c_client *client)
|
|
{
|
|
struct regulator_dev **rdev = i2c_get_clientdata(client);
|
|
int i;
|
|
|
|
for (i = 0; i <= MAX1586_V6; i++)
|
|
if (rdev[i])
|
|
regulator_unregister(rdev[i]);
|
|
i2c_set_clientdata(client, NULL);
|
|
kfree(rdev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct i2c_device_id max1586_id[] = {
|
|
{ "max1586", 0 },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, max1586_id);
|
|
|
|
static struct i2c_driver max1586_pmic_driver = {
|
|
.probe = max1586_pmic_probe,
|
|
.remove = __devexit_p(max1586_pmic_remove),
|
|
.driver = {
|
|
.name = "max1586",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
.id_table = max1586_id,
|
|
};
|
|
|
|
static int __init max1586_pmic_init(void)
|
|
{
|
|
return i2c_add_driver(&max1586_pmic_driver);
|
|
}
|
|
subsys_initcall(max1586_pmic_init);
|
|
|
|
static void __exit max1586_pmic_exit(void)
|
|
{
|
|
i2c_del_driver(&max1586_pmic_driver);
|
|
}
|
|
module_exit(max1586_pmic_exit);
|
|
|
|
/* Module information */
|
|
MODULE_DESCRIPTION("MAXIM 1586 voltage regulator driver");
|
|
MODULE_AUTHOR("Robert Jarzmik");
|
|
MODULE_LICENSE("GPL");
|