mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
- New Clocksource driver from ST - New MFD/ACPI/DMA drivers for Intel's Sunrisepoint PCH based platforms - Add support for Arizona WM8998 and WM1814 - Add support for Dialog Semi DA9062 and DA9063 - Add support for Kontron COMe-bBL6 and COMe-cBW6 - Add support for X-Powers AXP152 - Add support for Atmel, many - Add support for STMPE, many - Add support for USB in X-Powers AXP22X - Core Frameworks - New Base API to traverse devices and their children in reverse order - Bug Fixes - Fix race between runtime-suspend and IRQs - Obtain platform data form more reliable source - Fix-ups - Constifying things - Variable signage changes - Kconfig depends|selects changes - Make use of BIT() macro - Do not supply .owner attribute in *_driver structures - MAINTAINERS entries - Stop using set_irq_flags() - Start using irq_set_chained_handler_and_data() - Export DT device ID structures -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJV6FCRAAoJEFGvii+H/HdhO2MP/1GxcbbywMXU4goj40gJaYfx kk0zH0S7i8+A8hD7SoCIQNkWN5o7i6sNYUA6sCTnPqixbyrkduWCyid1XsATu+41 iiKEGyiCRyEHhCwnwCXvaFhpAZBzDi7FKj6hhf6nnRMHSEqwrs2aBqWgzNrOZTs0 u66i/JHccnDdfHHm9Y7XcKMA8pWVqRMnwwaHreuYTFqfrEB0UGCYpmEeEBynGVKh MUGC0lCUrEKp59aOexZRtBUla/5BeALJd//vMQtf/+D0YPvE8lppDNwkgCe4buXN ZlNHDQooIWIiZfTj7wbHaTWjrBK7MsOEHWBUjNsk2nyDvDOJoGhTrSdJwPeyhUSh d2eUyW6sPEQY21XPwuD0DhfRKYKLOzVRhIcxvjlRAq9QHDWVXKyIlf3M70fculK8 5FN1Wb6Sc2h0OvMC5RemPpxMwZSq6Ks3XANa718Ju802TGK/xk6iRqhZrEut/qrN rLYsU84TLUz6YindozTiI5FrGo+zSp9OlUU4z7HUh+4t3H5/opdsRjRp0ICwgIbY NxAmsk2d/vJ7xX7FAAjwMY2rPIC0zIksbGEe1AJweWV455EcDMaBM1/e9zDzHciI TXVxbzs3DFBadtQWlLv/VkwZmt43MTI8g6ozTTJJkPQNCKThtz4bvDSu8rQWqFua bkbRyQroraX5fM0Q3HIs =2blS -----END PGP SIGNATURE----- Merge tag 'mfd-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd Pull MFD updates from Lee Jones: "New Device Support: - New Clocksource driver from ST - New MFD/ACPI/DMA drivers for Intel's Sunrisepoint PCH based platforms - Add support for Arizona WM8998 and WM1814 - Add support for Dialog Semi DA9062 and DA9063 - Add support for Kontron COMe-bBL6 and COMe-cBW6 - Add support for X-Powers AXP152 - Add support for Atmel, many - Add support for STMPE, many - Add support for USB in X-Powers AXP22X Core Frameworks: - New Base API to traverse devices and their children in reverse order Bug Fixes: - Fix race between runtime-suspend and IRQs - Obtain platform data form more reliable source Fix-ups: - Constifying things - Variable signage changes - Kconfig depends|selects changes - Make use of BIT() macro - Do not supply .owner attribute in *_driver structures - MAINTAINERS entries - Stop using set_irq_flags() - Start using irq_set_chained_handler_and_data() - Export DT device ID structures" * tag 'mfd-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (69 commits) mfd: jz4740-adc: Init mask cache in generic IRQ chip mfd: cros_ec: spi: Add OF match table mfd: stmpe: Add OF match table mfd: max77686: Split out regulator part from the DT binding mfd: Add DT binding for Maxim MAX77802 IC mfd: max77686: Use a generic name for the PMIC node in the example mfd: max77686: Don't suggest in binding to use a deprecated property mfd: Add MFD_CROS_EC dependencies mfd: cros_ec: Remove CROS_EC_PROTO dependency for SPI and I2C drivers mfd: axp20x: Add a cell for the usb power_supply part of the axp20x PMICs mfd: axp20x: Add missing registers, and mark more registers volatile mfd: arizona: Fixup some formatting/white space errors mfd: wm8994: Fix NULL pointer exception on missing pdata of: Add vendor prefix for Nuvoton mfd: mt6397: Implement wake handler and suspend/resume to handle wake up event mfd: atmel-hlcdc: Add support for new SoCs mfd: Export OF module alias information in missing drivers mfd: stw481x: Export I2C module alias information mfd: da9062: Support for the DA9063 OnKey in the DA9062 core mfd: max899x: Avoid redundant irq_data lookup ...
139 lines
3.5 KiB
C
139 lines
3.5 KiB
C
/*
|
|
* ST Microelectronics MFD: stmpe's i2c client specific driver
|
|
*
|
|
* Copyright (C) ST-Ericsson SA 2010
|
|
* Copyright (C) ST Microelectronics SA 2011
|
|
*
|
|
* License Terms: GNU General Public License, version 2
|
|
* Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
|
|
* Author: Viresh Kumar <vireshk@kernel.org> for ST Microelectronics
|
|
*/
|
|
|
|
#include <linux/i2c.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/types.h>
|
|
#include <linux/of_device.h>
|
|
#include "stmpe.h"
|
|
|
|
static int i2c_reg_read(struct stmpe *stmpe, u8 reg)
|
|
{
|
|
struct i2c_client *i2c = stmpe->client;
|
|
|
|
return i2c_smbus_read_byte_data(i2c, reg);
|
|
}
|
|
|
|
static int i2c_reg_write(struct stmpe *stmpe, u8 reg, u8 val)
|
|
{
|
|
struct i2c_client *i2c = stmpe->client;
|
|
|
|
return i2c_smbus_write_byte_data(i2c, reg, val);
|
|
}
|
|
|
|
static int i2c_block_read(struct stmpe *stmpe, u8 reg, u8 length, u8 *values)
|
|
{
|
|
struct i2c_client *i2c = stmpe->client;
|
|
|
|
return i2c_smbus_read_i2c_block_data(i2c, reg, length, values);
|
|
}
|
|
|
|
static int i2c_block_write(struct stmpe *stmpe, u8 reg, u8 length,
|
|
const u8 *values)
|
|
{
|
|
struct i2c_client *i2c = stmpe->client;
|
|
|
|
return i2c_smbus_write_i2c_block_data(i2c, reg, length, values);
|
|
}
|
|
|
|
static struct stmpe_client_info i2c_ci = {
|
|
.read_byte = i2c_reg_read,
|
|
.write_byte = i2c_reg_write,
|
|
.read_block = i2c_block_read,
|
|
.write_block = i2c_block_write,
|
|
};
|
|
|
|
static const struct of_device_id stmpe_of_match[] = {
|
|
{ .compatible = "st,stmpe610", .data = (void *)STMPE610, },
|
|
{ .compatible = "st,stmpe801", .data = (void *)STMPE801, },
|
|
{ .compatible = "st,stmpe811", .data = (void *)STMPE811, },
|
|
{ .compatible = "st,stmpe1601", .data = (void *)STMPE1601, },
|
|
{ .compatible = "st,stmpe1801", .data = (void *)STMPE1801, },
|
|
{ .compatible = "st,stmpe2401", .data = (void *)STMPE2401, },
|
|
{ .compatible = "st,stmpe2403", .data = (void *)STMPE2403, },
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(of, stmpe_of_match);
|
|
|
|
static int
|
|
stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
|
|
{
|
|
enum stmpe_partnum partnum;
|
|
const struct of_device_id *of_id;
|
|
|
|
i2c_ci.data = (void *)id;
|
|
i2c_ci.irq = i2c->irq;
|
|
i2c_ci.client = i2c;
|
|
i2c_ci.dev = &i2c->dev;
|
|
|
|
of_id = of_match_device(stmpe_of_match, &i2c->dev);
|
|
if (!of_id) {
|
|
/*
|
|
* This happens when the I2C ID matches the node name
|
|
* but no real compatible string has been given.
|
|
*/
|
|
dev_info(&i2c->dev, "matching on node name, compatible is preferred\n");
|
|
partnum = id->driver_data;
|
|
} else
|
|
partnum = (enum stmpe_partnum)of_id->data;
|
|
|
|
return stmpe_probe(&i2c_ci, partnum);
|
|
}
|
|
|
|
static int stmpe_i2c_remove(struct i2c_client *i2c)
|
|
{
|
|
struct stmpe *stmpe = dev_get_drvdata(&i2c->dev);
|
|
|
|
return stmpe_remove(stmpe);
|
|
}
|
|
|
|
static const struct i2c_device_id stmpe_i2c_id[] = {
|
|
{ "stmpe610", STMPE610 },
|
|
{ "stmpe801", STMPE801 },
|
|
{ "stmpe811", STMPE811 },
|
|
{ "stmpe1601", STMPE1601 },
|
|
{ "stmpe1801", STMPE1801 },
|
|
{ "stmpe2401", STMPE2401 },
|
|
{ "stmpe2403", STMPE2403 },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, stmpe_id);
|
|
|
|
static struct i2c_driver stmpe_i2c_driver = {
|
|
.driver = {
|
|
.name = "stmpe-i2c",
|
|
#ifdef CONFIG_PM
|
|
.pm = &stmpe_dev_pm_ops,
|
|
#endif
|
|
.of_match_table = stmpe_of_match,
|
|
},
|
|
.probe = stmpe_i2c_probe,
|
|
.remove = stmpe_i2c_remove,
|
|
.id_table = stmpe_i2c_id,
|
|
};
|
|
|
|
static int __init stmpe_init(void)
|
|
{
|
|
return i2c_add_driver(&stmpe_i2c_driver);
|
|
}
|
|
subsys_initcall(stmpe_init);
|
|
|
|
static void __exit stmpe_exit(void)
|
|
{
|
|
i2c_del_driver(&stmpe_i2c_driver);
|
|
}
|
|
module_exit(stmpe_exit);
|
|
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_DESCRIPTION("STMPE MFD I2C Interface Driver");
|
|
MODULE_AUTHOR("Rabin Vincent <rabin.vincent@stericsson.com>");
|