Merge tag 'mfd-for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: "New Drivers: - Freescale Touch Screen ADC - X-Powers AXP PMIC with RSB - TI TPS65086 Power Management IC (PMIC) New Device Support: - Supply device PCI IDs for Intel Broxton Fix-ups: - Move to clkdev_create() API; intel_quark_i2c_gpio - Complete re-write of TI's TPS65912 Power Management IC (PMIC) - Remove unnecessary function argument; axp20x - Separate out bus related code; axp20x - Coding Style changes; axp20x - Allow more drivers to be compiled as modules - Work around false positive 'used uninitialised' warning; db8500-prcmu Bug Fixes: - Remove do_div(); fsl-imx25-gcq - Fix driver init when built-in; tps65010 - Fix clock-unregister leak; intel-lpss" * tag 'mfd-for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (53 commits) mfd: intel-lpss: Pass I2C configuration via properties on BXT mfd: imx6sx: Add PCIe register definitions for iomuxc gpr mfd: ipaq-micro: Use __maybe_unused to hide pm functions mfd: max77686: Add max77802 to I2C device ID table mfd: max77686: Export OF module alias information mfd: max77686: Allow driver to be built as a module mfd: stmpe: Add the proper PWM resources mfd: tps65090: Set regmap config reg counts properly mfd: syscon: Return ENOTSUPP instead of ENOSYS when disabled mfd: as3711: Set regmap config reg counts properly mfd: rc5t583: Set regmap config reg counts properly gpio: tps65086: Add GPO driver for the TPS65086 PMIC mfd: mt6397: Add platform device ID table mfd: da9063: Fix missing volatile registers in the core regmap_range volatile lists mfd: mt6397: Add MT6323 support to MT6397 driver mfd: mt6397: Add support for different Slave types mfd: mt6397: int_con and int_status may vary in location dt-bindings: mfd: Add bindings for the MediaTek MT6323 PMIC mfd: da9062: Fix missing volatile registers in the core regmap_range volatile lists mfd: Add documentation for ACT8945A DT bindings ...
这个提交包含在：
Linus Torvalds
@@ -898,6 +898,12 @@ config GPIO_TIMBERDALE
|
||||
---help---
|
||||
Add support for the GPIO IP in the timberdale FPGA.
|
||||
|
||||
config GPIO_TPS65086
|
||||
tristate "TI TPS65086 GPO"
|
||||
depends on MFD_TPS65086
|
||||
help
|
||||
This driver supports the GPO on TI TPS65086x PMICs.
|
||||
|
||||
config GPIO_TPS65218
|
||||
tristate "TPS65218 GPIO"
|
||||
depends on MFD_TPS65218
|
||||
|
||||
@@ -99,6 +99,7 @@ obj-$(CONFIG_ARCH_TEGRA) += gpio-tegra.o
|
||||
obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o
|
||||
obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o
|
||||
obj-$(CONFIG_GPIO_TPIC2810) += gpio-tpic2810.o
|
||||
obj-$(CONFIG_GPIO_TPS65086) += gpio-tps65086.o
|
||||
obj-$(CONFIG_GPIO_TPS65218) += gpio-tps65218.o
|
||||
obj-$(CONFIG_GPIO_TPS6586X) += gpio-tps6586x.o
|
||||
obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o
|
||||
|
||||
139
drivers/gpio/gpio-tps65086.c
普通文件
139
drivers/gpio/gpio-tps65086.c
普通文件
@@ -0,0 +1,139 @@
|
||||
/*
|
||||
* Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
|
||||
* Andrew F. Davis <afd@ti.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
|
||||
* kind, whether expressed or implied; without even the implied warranty
|
||||
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License version 2 for more details.
|
||||
*
|
||||
* Based on the TPS65912 driver
|
||||
*/
|
||||
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <linux/mfd/tps65086.h>
|
||||
|
||||
struct tps65086_gpio {
|
||||
struct gpio_chip chip;
|
||||
struct tps65086 *tps;
|
||||
};
|
||||
|
||||
static int tps65086_gpio_get_direction(struct gpio_chip *chip,
|
||||
unsigned offset)
|
||||
{
|
||||
/* This device is output only */
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tps65086_gpio_direction_input(struct gpio_chip *chip,
|
||||
unsigned offset)
|
||||
{
|
||||
/* This device is output only */
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int tps65086_gpio_direction_output(struct gpio_chip *chip,
|
||||
unsigned offset, int value)
|
||||
{
|
||||
struct tps65086_gpio *gpio = gpiochip_get_data(chip);
|
||||
|
||||
/* Set the initial value */
|
||||
regmap_update_bits(gpio->tps->regmap, TPS65086_GPOCTRL,
|
||||
BIT(4 + offset), value ? BIT(4 + offset) : 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tps65086_gpio_get(struct gpio_chip *chip, unsigned offset)
|
||||
{
|
||||
struct tps65086_gpio *gpio = gpiochip_get_data(chip);
|
||||
int ret, val;
|
||||
|
||||
ret = regmap_read(gpio->tps->regmap, TPS65086_GPOCTRL, &val);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
return val & BIT(4 + offset);
|
||||
}
|
||||
|
||||
static void tps65086_gpio_set(struct gpio_chip *chip, unsigned offset,
|
||||
int value)
|
||||
{
|
||||
struct tps65086_gpio *gpio = gpiochip_get_data(chip);
|
||||
|
||||
regmap_update_bits(gpio->tps->regmap, TPS65086_GPOCTRL,
|
||||
BIT(4 + offset), value ? BIT(4 + offset) : 0);
|
||||
}
|
||||
|
||||
static struct gpio_chip template_chip = {
|
||||
.label = "tps65086-gpio",
|
||||
.owner = THIS_MODULE,
|
||||
.get_direction = tps65086_gpio_get_direction,
|
||||
.direction_input = tps65086_gpio_direction_input,
|
||||
.direction_output = tps65086_gpio_direction_output,
|
||||
.get = tps65086_gpio_get,
|
||||
.set = tps65086_gpio_set,
|
||||
.base = -1,
|
||||
.ngpio = 4,
|
||||
.can_sleep = true,
|
||||
};
|
||||
|
||||
static int tps65086_gpio_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct tps65086_gpio *gpio;
|
||||
int ret;
|
||||
|
||||
gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
|
||||
if (!gpio)
|
||||
return -ENOMEM;
|
||||
|
||||
platform_set_drvdata(pdev, gpio);
|
||||
|
||||
gpio->tps = dev_get_drvdata(pdev->dev.parent);
|
||||
gpio->chip = template_chip;
|
||||
gpio->chip.parent = gpio->tps->dev;
|
||||
|
||||
ret = gpiochip_add_data(&gpio->chip, gpio);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tps65086_gpio_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct tps65086_gpio *gpio = platform_get_drvdata(pdev);
|
||||
|
||||
gpiochip_remove(&gpio->chip);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct platform_device_id tps65086_gpio_id_table[] = {
|
||||
{ "tps65086-gpio", },
|
||||
{ /* sentinel */ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(platform, tps65086_gpio_id_table);
|
||||
|
||||
static struct platform_driver tps65086_gpio_driver = {
|
||||
.driver = {
|
||||
.name = "tps65086-gpio",
|
||||
},
|
||||
.probe = tps65086_gpio_probe,
|
||||
.remove = tps65086_gpio_remove,
|
||||
.id_table = tps65086_gpio_id_table,
|
||||
};
|
||||
module_platform_driver(tps65086_gpio_driver);
|
||||
|
||||
MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
|
||||
MODULE_DESCRIPTION("TPS65086 GPIO driver");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
在新工单中引用
屏蔽一个用户