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)
- Increase DT coverage - arizona, mc13xxx, stmpe-i2c, syscon, sun6i-prcm - Regmap use of and/or clean-up - tps65090, twl6040 - Basic renaming - max14577 - Use new cpufreq helpers - db8500-prcmu - Increase regulator support - stmpe, arizona, wm5102 - Reduce legacy GPIO overhead - stmpe - Provide necessary remove path - bcm590xx - Expand sysfs presence - kempld - Move driver specific code out to drivers - rtc-s5m, arizona - Clk handling - twl6040 - Use managed (devm_*) resources - ipaq-micro - Clean-up/remove unused/duplicated code - tps65218, sec, pm8921, abx500-core db8500-prcmu, menelaus - Build/boot/sematic bug fixes - rtsx_usb, stmpe, bcm590xx, abx500, mc13xxx rdc321x-southbridge, mfd-core, sec, max14577 syscon, cros_ec_spi - Constify stuff - sm501, tps65910, tps6507x, tps6586x, max77686, max8997, kempld, max77693, max8907, rtsx_usb db8500-prcmu, max8998, wm8400, sec, lp3943, max14577, as3711, omap-usb-host, ipaq-micro Support for new devices: - Add support for max77836 into max14577 - Add support for tps658640 into tps6586x - Add support for cros-ec-i2c-tunnel into cros_ec - Add new driver for rtsx_usb_sdmmc and rtsx_usb_ms - Add new driver for axp20x - Add new driver for sun6i-prcm - Add new driver for ipaq-micro -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTkEAyAAoJEFGvii+H/HdhYdMP/j0MCmbORM9mr84Uuhi0PfBZ yE1zlhLQHtqQEcp4Ih6vWxIbgdhyHy3CqIiCKkhSTH0TWfreBX7DmlSc1QAKazpy sXeD/pB5TSIIfAHVh4NXF51WMzZ8OvQrmJQwdjUY1Sal2tlDCUdc84qtnn+3/J9N JIKpf4E1IeWojE8F3koKBcyE6ZzkAthIzWNDU9/y+sIZZEqPVRu9Y3mpdhPo6P3I 9TboZ/s2cAwad56iArFMOCvtg1xpn0WyS0HgAxpSa9X5qLRjYPX5GnBBz8zKJYm3 xHCiD6SgN29xX9W+MkcvtgEghhMfOkPgwF69u2/eagbtNEOm50cyLrvAe+SKjRvE pODs5yvHJap29cbVafHSdzV+zLZ51J/Oi/TFsG8/VBbd4DyW7oSM4juT20TFSiNt Edwzd4gicg/NxA7TupFCRQLgwAa3fnpPeCtsIims7LU7SclPuwNgS31isOGAkOvd mMaBa1clZb50Dy2iL8m1ugyqdOZXs9S24j3u+B0TTJyabMbNhDTGUwBG4/PrlJHq fIysx6CdNUGLikG2PybFvhCf3+FkEoPPtkloM1sblkhPHVunVlhXPRYAE90W2jUA dDQ2Aco/idWSGRZ5t7kA8OBN3+PwiIpxTt/D4eDmS7Qe/v3KXvhUYuKl2mD5+IfC StFiP5cd3zyJvWTeexuW =GYTU -----END PGP SIGNATURE----- Merge tag 'mfd-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into next Pull MFD updates from Lee Jones: "Changes to existing drivers: - increase DT coverage: arizona, mc13xxx, stmpe-i2c, syscon, sun6i-prcm - regmap use of and/or clean-up: tps65090, twl6040 - basic renaming: max14577 - use new cpufreq helpers: db8500-prcmu - increase regulator support: stmpe, arizona, wm5102 - reduce legacy GPIO overhead: stmpe - provide necessary remove path: bcm590xx - expand sysfs presence: kempld - move driver specific code out to drivers: rtc-s5m, arizona - clk handling: twl6040 - use managed (devm_*) resources: ipaq-micro - clean-up/remove unused/duplicated code: tps65218, sec, pm8921, abx500-core, db8500-prcmu, menelaus - build/boot/sematic bug fixes: rtsx_usb, stmpe, bcm590xx, abx500, mc13xxx, rdc321x-southbridge, mfd-core, sec, max14577, syscon, cros_ec_spi - constify stuff: sm501, tps65910, tps6507x, tps6586x, max77686, max8997, kempld, max77693, max8907, rtsx_usb, db8500-prcmu, max8998, wm8400, sec, lp3943, max14577, as3711, omap-usb-host, ipaq-micro Support for new devices: - add support for max77836 into max14577 - add support for tps658640 into tps6586x - add support for cros-ec-i2c-tunnel into cros_ec - add new driver for rtsx_usb_sdmmc and rtsx_usb_ms - add new driver for axp20x - add new driver for sun6i-prcm - add new driver for ipaq-micro" * tag 'mfd-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (77 commits) mfd: wm5102: Correct default for LDO Control 2 register mfd: menelaus: Use module_i2c_driver mfd: tps65218: Terminate of match table mfd: db8500-prcmu: Remove check for CONFIG_DBX500_PRCMU_DEBUG mfd: ti-keystone-devctrl: Add bindings for device state control mfd: palmas: Format the header file mfd: abx500-core: Remove unused function abx500_dump_all_banks() mfd: arizona: Correct addresses of always-on trigger registers mfd: max14577: Cast to architecture agnostic data type i2c: ChromeOS EC tunnel driver mfd: cros_ec: Sync to the latest cros_ec_commands.h from EC sources mfd: cros_ec: spi: Increase cros_ec_spi deadline from 5ms to 100ms mfd: cros_ec: spi: Make the cros_ec_spi timeout more reliable mfd: cros_ec: spi: Add mutex to cros_ec_spi mfd: cros_ec: spi: Calculate delay between transfers correctly mfd: arizona: Correct error message for addition of main IRQ chip mfd: wm8997: Add registers for high power mode mfd: arizona: Add MICVDD to mapped regulators mfd: ipaq-micro: Make mfd_cell array const mfd: ipaq-micro: Use devm_ioremap_resource() ...
132 lines
3.4 KiB
C
132 lines
3.4 KiB
C
/*
|
|
* Broadcom BCM590xx PMU
|
|
*
|
|
* Copyright 2014 Linaro Limited
|
|
* Author: Matt Porter <mporter@linaro.org>
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <linux/err.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/init.h>
|
|
#include <linux/mfd/bcm590xx.h>
|
|
#include <linux/mfd/core.h>
|
|
#include <linux/module.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/regmap.h>
|
|
#include <linux/slab.h>
|
|
|
|
static const struct mfd_cell bcm590xx_devs[] = {
|
|
{
|
|
.name = "bcm590xx-vregs",
|
|
},
|
|
};
|
|
|
|
static const struct regmap_config bcm590xx_regmap_config_pri = {
|
|
.reg_bits = 8,
|
|
.val_bits = 8,
|
|
.max_register = BCM590XX_MAX_REGISTER_PRI,
|
|
.cache_type = REGCACHE_RBTREE,
|
|
};
|
|
|
|
static const struct regmap_config bcm590xx_regmap_config_sec = {
|
|
.reg_bits = 8,
|
|
.val_bits = 8,
|
|
.max_register = BCM590XX_MAX_REGISTER_SEC,
|
|
.cache_type = REGCACHE_RBTREE,
|
|
};
|
|
|
|
static int bcm590xx_i2c_probe(struct i2c_client *i2c_pri,
|
|
const struct i2c_device_id *id)
|
|
{
|
|
struct bcm590xx *bcm590xx;
|
|
int ret;
|
|
|
|
bcm590xx = devm_kzalloc(&i2c_pri->dev, sizeof(*bcm590xx), GFP_KERNEL);
|
|
if (!bcm590xx)
|
|
return -ENOMEM;
|
|
|
|
i2c_set_clientdata(i2c_pri, bcm590xx);
|
|
bcm590xx->dev = &i2c_pri->dev;
|
|
bcm590xx->i2c_pri = i2c_pri;
|
|
|
|
bcm590xx->regmap_pri = devm_regmap_init_i2c(i2c_pri,
|
|
&bcm590xx_regmap_config_pri);
|
|
if (IS_ERR(bcm590xx->regmap_pri)) {
|
|
ret = PTR_ERR(bcm590xx->regmap_pri);
|
|
dev_err(&i2c_pri->dev, "primary regmap init failed: %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
/* Secondary I2C slave address is the base address with A(2) asserted */
|
|
bcm590xx->i2c_sec = i2c_new_dummy(i2c_pri->adapter,
|
|
i2c_pri->addr | BIT(2));
|
|
if (IS_ERR_OR_NULL(bcm590xx->i2c_sec)) {
|
|
dev_err(&i2c_pri->dev, "failed to add secondary I2C device\n");
|
|
return -ENODEV;
|
|
}
|
|
i2c_set_clientdata(bcm590xx->i2c_sec, bcm590xx);
|
|
|
|
bcm590xx->regmap_sec = devm_regmap_init_i2c(bcm590xx->i2c_sec,
|
|
&bcm590xx_regmap_config_sec);
|
|
if (IS_ERR(bcm590xx->regmap_sec)) {
|
|
ret = PTR_ERR(bcm590xx->regmap_sec);
|
|
dev_err(&bcm590xx->i2c_sec->dev,
|
|
"secondary regmap init failed: %d\n", ret);
|
|
goto err;
|
|
}
|
|
|
|
ret = mfd_add_devices(&i2c_pri->dev, -1, bcm590xx_devs,
|
|
ARRAY_SIZE(bcm590xx_devs), NULL, 0, NULL);
|
|
if (ret < 0) {
|
|
dev_err(&i2c_pri->dev, "failed to add sub-devices: %d\n", ret);
|
|
goto err;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err:
|
|
i2c_unregister_device(bcm590xx->i2c_sec);
|
|
return ret;
|
|
}
|
|
|
|
static int bcm590xx_i2c_remove(struct i2c_client *i2c)
|
|
{
|
|
mfd_remove_devices(&i2c->dev);
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id bcm590xx_of_match[] = {
|
|
{ .compatible = "brcm,bcm59056" },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, bcm590xx_of_match);
|
|
|
|
static const struct i2c_device_id bcm590xx_i2c_id[] = {
|
|
{ "bcm59056" },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, bcm590xx_i2c_id);
|
|
|
|
static struct i2c_driver bcm590xx_i2c_driver = {
|
|
.driver = {
|
|
.name = "bcm590xx",
|
|
.owner = THIS_MODULE,
|
|
.of_match_table = of_match_ptr(bcm590xx_of_match),
|
|
},
|
|
.probe = bcm590xx_i2c_probe,
|
|
.remove = bcm590xx_i2c_remove,
|
|
.id_table = bcm590xx_i2c_id,
|
|
};
|
|
module_i2c_driver(bcm590xx_i2c_driver);
|
|
|
|
MODULE_AUTHOR("Matt Porter <mporter@linaro.org>");
|
|
MODULE_DESCRIPTION("BCM590xx multi-function driver");
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_ALIAS("i2c:bcm590xx");
|