mirror of
https://github.com/torvalds/linux.git
synced 2024-11-19 02:21:47 +00:00
8bd8fd0a29
- 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 ...
163 lines
3.6 KiB
C
163 lines
3.6 KiB
C
/*
|
|
* ST Microelectronics MFD: stmpe's spi client specific driver
|
|
*
|
|
* Copyright (C) ST Microelectronics SA 2011
|
|
*
|
|
* License Terms: GNU General Public License, version 2
|
|
* Author: Viresh Kumar <vireshk@kernel.org> for ST Microelectronics
|
|
*/
|
|
|
|
#include <linux/spi/spi.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/types.h>
|
|
#include "stmpe.h"
|
|
|
|
#define READ_CMD (1 << 7)
|
|
|
|
static int spi_reg_read(struct stmpe *stmpe, u8 reg)
|
|
{
|
|
struct spi_device *spi = stmpe->client;
|
|
int status = spi_w8r16(spi, reg | READ_CMD);
|
|
|
|
return (status < 0) ? status : status >> 8;
|
|
}
|
|
|
|
static int spi_reg_write(struct stmpe *stmpe, u8 reg, u8 val)
|
|
{
|
|
struct spi_device *spi = stmpe->client;
|
|
u16 cmd = (val << 8) | reg;
|
|
|
|
return spi_write(spi, (const u8 *)&cmd, 2);
|
|
}
|
|
|
|
static int spi_block_read(struct stmpe *stmpe, u8 reg, u8 length, u8 *values)
|
|
{
|
|
int ret, i;
|
|
|
|
for (i = 0; i < length; i++) {
|
|
ret = spi_reg_read(stmpe, reg + i);
|
|
if (ret < 0)
|
|
return ret;
|
|
*(values + i) = ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int spi_block_write(struct stmpe *stmpe, u8 reg, u8 length,
|
|
const u8 *values)
|
|
{
|
|
int ret = 0, i;
|
|
|
|
for (i = length; i > 0; i--, reg++) {
|
|
ret = spi_reg_write(stmpe, reg, *(values + i - 1));
|
|
if (ret < 0)
|
|
return ret;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void spi_init(struct stmpe *stmpe)
|
|
{
|
|
struct spi_device *spi = stmpe->client;
|
|
|
|
spi->bits_per_word = 8;
|
|
|
|
/* This register is only present for stmpe811 */
|
|
if (stmpe->variant->id_val == 0x0811)
|
|
spi_reg_write(stmpe, STMPE811_REG_SPI_CFG, spi->mode);
|
|
|
|
if (spi_setup(spi) < 0)
|
|
dev_dbg(&spi->dev, "spi_setup failed\n");
|
|
}
|
|
|
|
static struct stmpe_client_info spi_ci = {
|
|
.read_byte = spi_reg_read,
|
|
.write_byte = spi_reg_write,
|
|
.read_block = spi_block_read,
|
|
.write_block = spi_block_write,
|
|
.init = spi_init,
|
|
};
|
|
|
|
static int
|
|
stmpe_spi_probe(struct spi_device *spi)
|
|
{
|
|
const struct spi_device_id *id = spi_get_device_id(spi);
|
|
|
|
/* don't exceed max specified rate - 1MHz - Limitation of STMPE */
|
|
if (spi->max_speed_hz > 1000000) {
|
|
dev_dbg(&spi->dev, "f(sample) %d KHz?\n",
|
|
(spi->max_speed_hz/1000));
|
|
return -EINVAL;
|
|
}
|
|
|
|
spi_ci.irq = spi->irq;
|
|
spi_ci.client = spi;
|
|
spi_ci.dev = &spi->dev;
|
|
|
|
return stmpe_probe(&spi_ci, id->driver_data);
|
|
}
|
|
|
|
static int stmpe_spi_remove(struct spi_device *spi)
|
|
{
|
|
struct stmpe *stmpe = spi_get_drvdata(spi);
|
|
|
|
return stmpe_remove(stmpe);
|
|
}
|
|
|
|
static const struct of_device_id stmpe_spi_of_match[] = {
|
|
{ .compatible = "st,stmpe610", },
|
|
{ .compatible = "st,stmpe801", },
|
|
{ .compatible = "st,stmpe811", },
|
|
{ .compatible = "st,stmpe1601", },
|
|
{ .compatible = "st,stmpe2401", },
|
|
{ .compatible = "st,stmpe2403", },
|
|
{ /* sentinel */ },
|
|
};
|
|
MODULE_DEVICE_TABLE(of, stmpe_spi_of_match);
|
|
|
|
static const struct spi_device_id stmpe_spi_id[] = {
|
|
{ "stmpe610", STMPE610 },
|
|
{ "stmpe801", STMPE801 },
|
|
{ "stmpe811", STMPE811 },
|
|
{ "stmpe1601", STMPE1601 },
|
|
{ "stmpe2401", STMPE2401 },
|
|
{ "stmpe2403", STMPE2403 },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(spi, stmpe_id);
|
|
|
|
static struct spi_driver stmpe_spi_driver = {
|
|
.driver = {
|
|
.name = "stmpe-spi",
|
|
.of_match_table = of_match_ptr(stmpe_spi_of_match),
|
|
.owner = THIS_MODULE,
|
|
#ifdef CONFIG_PM
|
|
.pm = &stmpe_dev_pm_ops,
|
|
#endif
|
|
},
|
|
.probe = stmpe_spi_probe,
|
|
.remove = stmpe_spi_remove,
|
|
.id_table = stmpe_spi_id,
|
|
};
|
|
|
|
static int __init stmpe_init(void)
|
|
{
|
|
return spi_register_driver(&stmpe_spi_driver);
|
|
}
|
|
subsys_initcall(stmpe_init);
|
|
|
|
static void __exit stmpe_exit(void)
|
|
{
|
|
spi_unregister_driver(&stmpe_spi_driver);
|
|
}
|
|
module_exit(stmpe_exit);
|
|
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_DESCRIPTION("STMPE MFD SPI Interface Driver");
|
|
MODULE_AUTHOR("Viresh Kumar <vireshk@kernel.org>");
|