mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
We have several new drivers, most of the time coming with their sub devices drivers: - Austria Microsystem's AS3711 - Nano River's viperboard - TI's TPS80031, AM335x TS/ADC, - Realtek's MMC/memstick card reader - Nokia's retu We also got some notable cleanups and improvements: - tps6586x got converted to IRQ domains. - tps65910 and tps65090 moved to the regmap IRQ API. - STMPE is now Device Tree aware. - A general twl6040 and twl-core cleanup, with moves to the regmap I/O and IRQ APIs and a conversion to the recently added PWM framework. - sta2x11 gained regmap support. Then the rest is mostly tiny cleanups and fixes, among which we have Mark's wm5xxx and wm8xxx patchset. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQznPnAAoJEIqAPN1PVmxKuA8P/0nOJduXFM1c0Gy+DD5DnJnG cXzzeSTV8iO3a3sHIye43QPJ5V2YUR5uxLTUEOo/G7my/MoZ/azeNidkUD3qLVlm wVIq35lcS8dWTZaY7nlpBcWc6e39UB0sEueuJNxyhOv5lnMKdi2tAow5f4vIRQnd Q67/EbrgqdltcOpGmVuCdQcvphvWgy+K65jzbJG5zXs7hGX13Q+M5RnYhx76kc8f TDd0APZ71n5/RyISFSBSu2vfl2kES6o47aMgqqXMEHri6d3puAaXM0rFoMzXg/4G eBdxndN25H7rW7xvt9tuUod2rn1AO7tif5d7jal3Cfj61y3iqKY30yb3OzS9XQXH 9WZ2qDst11zvzQivxIkMGvfRXRfncNLWR4DrBSqVfSbYV2uQj2eS8C6ONwKVMXsQ 5tjNp91PFqN19sWQjIjSMcrNswxgpvdQ9mqFTyOGmISbqrpPSTi+MuO8r9+xTfUF PnzUX2nVOW/i9NcI7uotjzh8jiw6t8XMVHhkehiSYR9hzCb6MaPsFPN4jWq9XA2m 1htCHylNpHqHQ3Mup7Is6j0Li1ahdwfm4lbrgiVEA4t4Mqs5E/Ka+3V8laNAKylW PfCP/VmnJYzmgVTK/qobFNeKzRqR0i4WTL6T7oAxGL87Q4TJaqKpEkXWne8UXV+Q yIbN0fmWfCveCetM+vaf =F790 -----END PGP SIGNATURE----- Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 Pull MFS update from Samuel Ortiz: "This is the MFD patch set for the 3.8 merge window. We have several new drivers, most of the time coming with their sub devices drivers: - Austria Microsystem's AS3711 - Nano River's viperboard - TI's TPS80031, AM335x TS/ADC, - Realtek's MMC/memstick card reader - Nokia's retu We also got some notable cleanups and improvements: - tps6586x got converted to IRQ domains. - tps65910 and tps65090 moved to the regmap IRQ API. - STMPE is now Device Tree aware. - A general twl6040 and twl-core cleanup, with moves to the regmap I/O and IRQ APIs and a conversion to the recently added PWM framework. - sta2x11 gained regmap support. Then the rest is mostly tiny cleanups and fixes, among which we have Mark's wm5xxx and wm8xxx patchset." Far amount of annoying but largely trivial conflicts. Many due to __devinit/exit removal, others due to one or two of the new drivers also having come in through another tree. * tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (119 commits) mfd: tps6507x: Convert to devm_kzalloc mfd: stmpe: Update DT support for stmpe driver mfd: wm5102: Add readback of DSP status 3 register mfd: arizona: Log if we fail to create the primary IRQ domain mfd: tps80031: MFD_TPS80031 needs to select REGMAP_IRQ mfd: tps80031: Add terminating entry for tps80031_id_table mfd: sta2x11: Fix potential NULL pointer dereference in __sta2x11_mfd_mask() mfd: wm5102: Add tuning for revision B mfd: arizona: Defer patch initialistation until after first device boot mfd: tps65910: Fix wrong ack_base register mfd: tps65910: Remove unused data mfd: stmpe: Get rid of irq_invert_polarity mfd: ab8500-core: Fix invalid free of devm_ allocated data mfd: wm5102: Mark DSP memory regions as volatile mfd: wm5102: Correct default for LDO1_CONTROL_2 mfd: arizona: Register haptics devices mfd: wm8994: Make current device behaviour the default mfd: tps65090: MFD_TPS65090 needs to select REGMAP_IRQ mfd: Fix stmpe.c build when OF is not enabled mfd: jz4740-adc: Use devm_kzalloc ...
269 lines
6.5 KiB
C
269 lines
6.5 KiB
C
/*
|
|
* tps65217.c
|
|
*
|
|
* TPS65217 chip family multi-function driver
|
|
*
|
|
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
|
|
*
|
|
* 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 version 2.
|
|
*
|
|
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
|
|
* kind, whether express or implied; without even the implied warranty
|
|
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/device.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/init.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/regmap.h>
|
|
#include <linux/err.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_device.h>
|
|
|
|
#include <linux/mfd/core.h>
|
|
#include <linux/mfd/tps65217.h>
|
|
|
|
static struct mfd_cell tps65217s[] = {
|
|
{
|
|
.name = "tps65217-pmic",
|
|
},
|
|
{
|
|
.name = "tps65217-bl",
|
|
},
|
|
};
|
|
|
|
/**
|
|
* tps65217_reg_read: Read a single tps65217 register.
|
|
*
|
|
* @tps: Device to read from.
|
|
* @reg: Register to read.
|
|
* @val: Contians the value
|
|
*/
|
|
int tps65217_reg_read(struct tps65217 *tps, unsigned int reg,
|
|
unsigned int *val)
|
|
{
|
|
return regmap_read(tps->regmap, reg, val);
|
|
}
|
|
EXPORT_SYMBOL_GPL(tps65217_reg_read);
|
|
|
|
/**
|
|
* tps65217_reg_write: Write a single tps65217 register.
|
|
*
|
|
* @tps65217: Device to write to.
|
|
* @reg: Register to write to.
|
|
* @val: Value to write.
|
|
* @level: Password protected level
|
|
*/
|
|
int tps65217_reg_write(struct tps65217 *tps, unsigned int reg,
|
|
unsigned int val, unsigned int level)
|
|
{
|
|
int ret;
|
|
unsigned int xor_reg_val;
|
|
|
|
switch (level) {
|
|
case TPS65217_PROTECT_NONE:
|
|
return regmap_write(tps->regmap, reg, val);
|
|
case TPS65217_PROTECT_L1:
|
|
xor_reg_val = reg ^ TPS65217_PASSWORD_REGS_UNLOCK;
|
|
ret = regmap_write(tps->regmap, TPS65217_REG_PASSWORD,
|
|
xor_reg_val);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
return regmap_write(tps->regmap, reg, val);
|
|
case TPS65217_PROTECT_L2:
|
|
xor_reg_val = reg ^ TPS65217_PASSWORD_REGS_UNLOCK;
|
|
ret = regmap_write(tps->regmap, TPS65217_REG_PASSWORD,
|
|
xor_reg_val);
|
|
if (ret < 0)
|
|
return ret;
|
|
ret = regmap_write(tps->regmap, reg, val);
|
|
if (ret < 0)
|
|
return ret;
|
|
ret = regmap_write(tps->regmap, TPS65217_REG_PASSWORD,
|
|
xor_reg_val);
|
|
if (ret < 0)
|
|
return ret;
|
|
return regmap_write(tps->regmap, reg, val);
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(tps65217_reg_write);
|
|
|
|
/**
|
|
* tps65217_update_bits: Modify bits w.r.t mask, val and level.
|
|
*
|
|
* @tps65217: Device to write to.
|
|
* @reg: Register to read-write to.
|
|
* @mask: Mask.
|
|
* @val: Value to write.
|
|
* @level: Password protected level
|
|
*/
|
|
static int tps65217_update_bits(struct tps65217 *tps, unsigned int reg,
|
|
unsigned int mask, unsigned int val, unsigned int level)
|
|
{
|
|
int ret;
|
|
unsigned int data;
|
|
|
|
ret = tps65217_reg_read(tps, reg, &data);
|
|
if (ret) {
|
|
dev_err(tps->dev, "Read from reg 0x%x failed\n", reg);
|
|
return ret;
|
|
}
|
|
|
|
data &= ~mask;
|
|
data |= val & mask;
|
|
|
|
ret = tps65217_reg_write(tps, reg, data, level);
|
|
if (ret)
|
|
dev_err(tps->dev, "Write for reg 0x%x failed\n", reg);
|
|
|
|
return ret;
|
|
}
|
|
|
|
int tps65217_set_bits(struct tps65217 *tps, unsigned int reg,
|
|
unsigned int mask, unsigned int val, unsigned int level)
|
|
{
|
|
return tps65217_update_bits(tps, reg, mask, val, level);
|
|
}
|
|
EXPORT_SYMBOL_GPL(tps65217_set_bits);
|
|
|
|
int tps65217_clear_bits(struct tps65217 *tps, unsigned int reg,
|
|
unsigned int mask, unsigned int level)
|
|
{
|
|
return tps65217_update_bits(tps, reg, mask, 0, level);
|
|
}
|
|
EXPORT_SYMBOL_GPL(tps65217_clear_bits);
|
|
|
|
static struct regmap_config tps65217_regmap_config = {
|
|
.reg_bits = 8,
|
|
.val_bits = 8,
|
|
};
|
|
|
|
static const struct of_device_id tps65217_of_match[] = {
|
|
{ .compatible = "ti,tps65217", .data = (void *)TPS65217 },
|
|
{ /* sentinel */ },
|
|
};
|
|
|
|
static int tps65217_probe(struct i2c_client *client,
|
|
const struct i2c_device_id *ids)
|
|
{
|
|
struct tps65217 *tps;
|
|
unsigned int version;
|
|
unsigned int chip_id = ids->driver_data;
|
|
const struct of_device_id *match;
|
|
bool status_off = false;
|
|
int ret;
|
|
|
|
if (client->dev.of_node) {
|
|
match = of_match_device(tps65217_of_match, &client->dev);
|
|
if (!match) {
|
|
dev_err(&client->dev,
|
|
"Failed to find matching dt id\n");
|
|
return -EINVAL;
|
|
}
|
|
chip_id = (unsigned int)match->data;
|
|
status_off = of_property_read_bool(client->dev.of_node,
|
|
"ti,pmic-shutdown-controller");
|
|
}
|
|
|
|
if (!chip_id) {
|
|
dev_err(&client->dev, "id is null.\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
|
|
if (!tps)
|
|
return -ENOMEM;
|
|
|
|
i2c_set_clientdata(client, tps);
|
|
tps->dev = &client->dev;
|
|
tps->id = chip_id;
|
|
|
|
tps->regmap = devm_regmap_init_i2c(client, &tps65217_regmap_config);
|
|
if (IS_ERR(tps->regmap)) {
|
|
ret = PTR_ERR(tps->regmap);
|
|
dev_err(tps->dev, "Failed to allocate register map: %d\n",
|
|
ret);
|
|
return ret;
|
|
}
|
|
|
|
ret = mfd_add_devices(tps->dev, -1, tps65217s,
|
|
ARRAY_SIZE(tps65217s), NULL, 0, NULL);
|
|
if (ret < 0) {
|
|
dev_err(tps->dev, "mfd_add_devices failed: %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
ret = tps65217_reg_read(tps, TPS65217_REG_CHIPID, &version);
|
|
if (ret < 0) {
|
|
dev_err(tps->dev, "Failed to read revision register: %d\n",
|
|
ret);
|
|
return ret;
|
|
}
|
|
|
|
/* Set the PMIC to shutdown on PWR_EN toggle */
|
|
if (status_off) {
|
|
ret = tps65217_set_bits(tps, TPS65217_REG_STATUS,
|
|
TPS65217_STATUS_OFF, TPS65217_STATUS_OFF,
|
|
TPS65217_PROTECT_NONE);
|
|
if (ret)
|
|
dev_warn(tps->dev, "unable to set the status OFF\n");
|
|
}
|
|
|
|
dev_info(tps->dev, "TPS65217 ID %#x version 1.%d\n",
|
|
(version & TPS65217_CHIPID_CHIP_MASK) >> 4,
|
|
version & TPS65217_CHIPID_REV_MASK);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int tps65217_remove(struct i2c_client *client)
|
|
{
|
|
struct tps65217 *tps = i2c_get_clientdata(client);
|
|
|
|
mfd_remove_devices(tps->dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct i2c_device_id tps65217_id_table[] = {
|
|
{"tps65217", TPS65217},
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, tps65217_id_table);
|
|
|
|
static struct i2c_driver tps65217_driver = {
|
|
.driver = {
|
|
.name = "tps65217",
|
|
.owner = THIS_MODULE,
|
|
.of_match_table = of_match_ptr(tps65217_of_match),
|
|
},
|
|
.id_table = tps65217_id_table,
|
|
.probe = tps65217_probe,
|
|
.remove = tps65217_remove,
|
|
};
|
|
|
|
static int __init tps65217_init(void)
|
|
{
|
|
return i2c_add_driver(&tps65217_driver);
|
|
}
|
|
subsys_initcall(tps65217_init);
|
|
|
|
static void __exit tps65217_exit(void)
|
|
{
|
|
i2c_del_driver(&tps65217_driver);
|
|
}
|
|
module_exit(tps65217_exit);
|
|
|
|
MODULE_AUTHOR("AnilKumar Ch <anilkumar@ti.com>");
|
|
MODULE_DESCRIPTION("TPS65217 chip family multi-function driver");
|
|
MODULE_LICENSE("GPL v2");
|