mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
MFD changes due for the v3.14 merge window
New drivers
- Samsung Maxim 14577; Micro USB, Regulator, IRQ Controller and Battery Charger
- TI/National Semiconductor LP3943 I2C GPIO Expander and PWM Generator
Existing driver adaptions
- Expansion of Wolfson Arizona DSP and High-Pass filter controls
- TI TWL6040 default Regmap support and Regcache addition/bypass
- Some nice Smatch catch fixes
- Conversion of TI OMAP-USB and TI TWL6030 to endian neutralness
- ChromeOS EC timing (delay) adaptions and added dependency on OF
- Many constifications of 'struct {mfd_cell,regmap_irq,et. al}'
- Watchdog support added for NVIDIA AS3722
- Convert functions to static in TI AM335x
- Realigned previously defeated functionality in TI AM335x
- IIO ADC-TSC concurrency dead-lock/timeout resolution
- Addition of Power Management and Clock support for Samsung core
- DEFINE_PCI_DEVICE_TABLE macro removal from MFD Subsystem
- Greater use of irqdomain functionality in ST-E AB8500
- Removal of 'include/linux/mfd/abx500/ab8500-gpio.h'
- Wolfson WM831x PMIC Power Management changes s/poweroff/shutdown/
- Device Tree documentation added for TI/Nat Semi LP3943
- Version detection and voltage tables for TI TPS6586x PMIC devices
- Simplification of Freescale MC13XXX (de-)initialisation routines
- Clean-up and simplification of the Realtek parent driver
- Added support for RTL8402 Realtek PCI-Express card reader
- Resource leak fix for Maxim 77686
- Possible suspend BUG() fix in OMAP USB TLL
- Support for new Wolfson WM5110 Revision (D)
- Testing of automatic assignment of of_node in mfd_add_device()
- Reversion of the above when it started to cause issues
- Remove legacy Platform Data from;
TI TWL Core, Qualcomm SSBI and ST-E ABx500 Pinctrl
- Clean-ups; tabbing issues, function name changes, 'drvdata = NULL' removal,
unused uninitialised warning mitigation, error message clarity,
removal of redundant/duplicate checks, licensing (GPL -> GPL2),
coding consistency, duplicate function declaration, ret checks,
commit corrections, redundant of_match_ptr() helper removal,
spelling, #if-deffery removal and header guards name changes
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)
iQIbBAABAgAGBQJS3pLGAAoJEFGvii+H/HdhmkkP93Hrd9FBjVpmUQcOrghFDd//
vte2LVDovXDcwm7i+BdZNG3+2aWtliTQXIw8PaAziUTwMlDNtT2B6GBFnIff4aXB
Em/Oh6Je7r1gom1gMPCuefRrInTk0xEXy9Oazp4Hn4in71T+8PHNlEHdxEojakEm
H5FnjAfgISEsA5twSyO9efVLNqPd3UQqg3O571oKwfuSED70YSCW2Yyaoiz4pnE5
0WwZ9cel+sP7CIuyuR4TumUSDeBIAnYnZWqjqXZ1ueMWcm2RNVqeFrt/w0uoZjOA
yBg8ZMfkBcePd6qnifqVqagRW/jW1bxmUeIHkp0bWeMqWN6Yyypitz8ZW+Qi7Swa
OcmgM9V7OW1WG9FF7HoLbYHIPzmBb6duGtcCfAir4m8HJjyPfTuJpOshBW1F3+VG
yEf5a1fj2NO34kvIbLec2f7MveIMmZxzWaoOx+ET9/WPknilifgyp7eDH24pQwI4
5Lo5Z5uAfBCT3roOzHxCLl2nVXQoC66iTwdnneiEOn4rB/ApjfGVvGGd0VT6TD+g
z3RqxpTdkd0AtjfeF778uTDBEKu7HZkqmlBP8HKWCBEAzqcKg7BpjYw0ajgmVwKr
QiuBuWcEZ/2vVt8Qot7y5Vx89Q4AQwOqc24SldtQLu46iPAuKt+GizzHRw3IxBiQ
VU9Aq/VoaTHBLS91tDE=
=PuTE
-----END PGP SIGNATURE-----
Merge tag 'mfd-3.14-1' of git://git.linaro.org/people/ljones/mfd
Pull MFD changes from Lee Jones:
"New drivers
- Samsung Maxim 14577; Micro USB, Regulator, IRQ Controller and
Battery Charger
- TI/National Semiconductor LP3943 I2C GPIO Expander and PWM
Generator
Existing driver adaptions
- Expansion of Wolfson Arizona DSP and High-Pass filter controls
- TI TWL6040 default Regmap support and Regcache addition/bypass
- Some nice Smatch catch fixes
- Conversion of TI OMAP-USB and TI TWL6030 to endian neutralness
- ChromeOS EC timing (delay) adaptions and added dependency on OF
- Many constifications of 'struct {mfd_cell,regmap_irq,et.al}'
- Watchdog support added for NVIDIA AS3722
- Convert functions to static in TI AM335x
- Realigned previously defeated functionality in TI AM335x
- IIO ADC-TSC concurrency dead-lock/timeout resolution
- Addition of Power Management and Clock support for Samsung core
- DEFINE_PCI_DEVICE_TABLE macro removal from MFD Subsystem
- Greater use of irqdomain functionality in ST-E AB8500
- Removal of 'include/linux/mfd/abx500/ab8500-gpio.h'
- Wolfson WM831x PMIC Power Management changes s/poweroff/shutdown/
- Device Tree documentation added for TI/Nat Semi LP3943
- Version detection and voltage tables for TI TPS6586x PMIC devices
- Simplification of Freescale MC13XXX (de-)initialisation routines
- Clean-up and simplification of the Realtek parent driver
- Added support for RTL8402 Realtek PCI-Express card reader
- Resource leak fix for Maxim 77686
- Possible suspend BUG() fix in OMAP USB TLL
- Support for new Wolfson WM5110 Revision (D)
- Testing of automatic assignment of of_node in mfd_add_device()
- Reversion of the above when it started to cause issues
- Remove legacy Platform Data from;
TI TWL Core, Qualcomm SSBI and ST-E ABx500 Pinctrl
- Clean-ups; tabbing issues, function name changes, 'drvdata = NULL'
removal, unused uninitialised warning mitigation, error
message clarity, removal of redundant/duplicate checks,
licensing (GPL -> GPL2), coding consistency, duplicate
function declaration, ret checks, commit corrections,
redundant of_match_ptr() helper removal, spelling,
#if-deffery removal and header guards name changes"
* tag 'mfd-3.14-1' of git://git.linaro.org/people/ljones/mfd: (78 commits)
mfd: wm5110: Add register patch for rev D chip
mfd: omap-usb-tll: Don't hold lock during pm_runtime_get/put_sync()
gpio: lp3943: Remove redundant of_match_ptr helper
mfd: sta2x11-mfd: Use named constants for pci_power_t values
Documentation: mfd: Fix LDO index in s2mps11.txt
mfd: Cleanup mfd-mcp-sa11x0.h header
mfd: max8997: Use "IS_ENABLED(CONFIG_OF)" for DT code.
mfd: twl6030: Fix endianness problem in IRQ handler
mfd: sec-core: Add cells for S5M8767-clocks
mfd: max14577: Remove redundant of_match_ptr helper
mfd: twl6040: Fix sparse non static symbol warning
mfd: Revert "mfd: Always assign of_node in mfd_add_device()"
mfd: rtsx: Fix sparse non static symbol warning
mfd: max77693: Set proper maximum register for MUIC regmap
mfd: max77686: Fix regmap resource leak on driver remove
mfd: Represent correct filenames in file headers
mfd: rtsx: Add support for card reader rtl8402
mfd: rtsx: Add set pull control macro and simplify rtl8411
mfd: max8997: Enforce mfd_add_devices() return value check
mfd: mc13xxx: Simplify probe() & remove()
...
This commit is contained in:
Linus Torvalds
commit
ac26663572
106 changed files with 2343 additions and 653 deletions
|
|
@ -406,6 +406,14 @@ config GPIO_ARIZONA
|
|||
help
|
||||
Support for GPIOs on Wolfson Arizona class devices.
|
||||
|
||||
config GPIO_LP3943
|
||||
tristate "TI/National Semiconductor LP3943 GPIO expander"
|
||||
depends on MFD_LP3943
|
||||
help
|
||||
GPIO driver for LP3943 MFD.
|
||||
LP3943 can be used as a GPIO expander which provides up to 16 GPIOs.
|
||||
Open drain outputs are required for this usage.
|
||||
|
||||
config GPIO_MAX7300
|
||||
tristate "Maxim MAX7300 GPIO expander"
|
||||
depends on I2C
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o
|
|||
obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o
|
||||
obj-$(CONFIG_ARCH_KS8695) += gpio-ks8695.o
|
||||
obj-$(CONFIG_GPIO_INTEL_MID) += gpio-intel-mid.o
|
||||
obj-$(CONFIG_GPIO_LP3943) += gpio-lp3943.o
|
||||
obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o
|
||||
obj-$(CONFIG_GPIO_LYNXPOINT) += gpio-lynxpoint.o
|
||||
obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o
|
||||
|
|
|
|||
242
drivers/gpio/gpio-lp3943.c
Normal file
242
drivers/gpio/gpio-lp3943.c
Normal file
|
|
@ -0,0 +1,242 @@
|
|||
/*
|
||||
* TI/National Semiconductor LP3943 GPIO driver
|
||||
*
|
||||
* Copyright 2013 Texas Instruments
|
||||
*
|
||||
* Author: Milo Kim <milo.kim@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.
|
||||
*/
|
||||
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/mfd/lp3943.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
enum lp3943_gpios {
|
||||
LP3943_GPIO1,
|
||||
LP3943_GPIO2,
|
||||
LP3943_GPIO3,
|
||||
LP3943_GPIO4,
|
||||
LP3943_GPIO5,
|
||||
LP3943_GPIO6,
|
||||
LP3943_GPIO7,
|
||||
LP3943_GPIO8,
|
||||
LP3943_GPIO9,
|
||||
LP3943_GPIO10,
|
||||
LP3943_GPIO11,
|
||||
LP3943_GPIO12,
|
||||
LP3943_GPIO13,
|
||||
LP3943_GPIO14,
|
||||
LP3943_GPIO15,
|
||||
LP3943_GPIO16,
|
||||
LP3943_MAX_GPIO,
|
||||
};
|
||||
|
||||
struct lp3943_gpio {
|
||||
struct gpio_chip chip;
|
||||
struct lp3943 *lp3943;
|
||||
u16 input_mask; /* 1 = GPIO is input direction, 0 = output */
|
||||
};
|
||||
|
||||
static inline struct lp3943_gpio *to_lp3943_gpio(struct gpio_chip *_chip)
|
||||
{
|
||||
return container_of(_chip, struct lp3943_gpio, chip);
|
||||
}
|
||||
|
||||
static int lp3943_gpio_request(struct gpio_chip *chip, unsigned offset)
|
||||
{
|
||||
struct lp3943_gpio *lp3943_gpio = to_lp3943_gpio(chip);
|
||||
struct lp3943 *lp3943 = lp3943_gpio->lp3943;
|
||||
|
||||
/* Return an error if the pin is already assigned */
|
||||
if (test_and_set_bit(offset, &lp3943->pin_used))
|
||||
return -EBUSY;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void lp3943_gpio_free(struct gpio_chip *chip, unsigned offset)
|
||||
{
|
||||
struct lp3943_gpio *lp3943_gpio = to_lp3943_gpio(chip);
|
||||
struct lp3943 *lp3943 = lp3943_gpio->lp3943;
|
||||
|
||||
clear_bit(offset, &lp3943->pin_used);
|
||||
}
|
||||
|
||||
static int lp3943_gpio_set_mode(struct lp3943_gpio *lp3943_gpio, u8 offset,
|
||||
u8 val)
|
||||
{
|
||||
struct lp3943 *lp3943 = lp3943_gpio->lp3943;
|
||||
const struct lp3943_reg_cfg *mux = lp3943->mux_cfg;
|
||||
|
||||
return lp3943_update_bits(lp3943, mux[offset].reg, mux[offset].mask,
|
||||
val << mux[offset].shift);
|
||||
}
|
||||
|
||||
static int lp3943_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
|
||||
{
|
||||
struct lp3943_gpio *lp3943_gpio = to_lp3943_gpio(chip);
|
||||
|
||||
lp3943_gpio->input_mask |= BIT(offset);
|
||||
|
||||
return lp3943_gpio_set_mode(lp3943_gpio, offset, LP3943_GPIO_IN);
|
||||
}
|
||||
|
||||
static int lp3943_get_gpio_in_status(struct lp3943_gpio *lp3943_gpio,
|
||||
struct gpio_chip *chip, unsigned offset)
|
||||
{
|
||||
u8 addr, read;
|
||||
int err;
|
||||
|
||||
switch (offset) {
|
||||
case LP3943_GPIO1 ... LP3943_GPIO8:
|
||||
addr = LP3943_REG_GPIO_A;
|
||||
break;
|
||||
case LP3943_GPIO9 ... LP3943_GPIO16:
|
||||
addr = LP3943_REG_GPIO_B;
|
||||
offset = offset - 8;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
err = lp3943_read_byte(lp3943_gpio->lp3943, addr, &read);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
return !!(read & BIT(offset));
|
||||
}
|
||||
|
||||
static int lp3943_get_gpio_out_status(struct lp3943_gpio *lp3943_gpio,
|
||||
struct gpio_chip *chip, unsigned offset)
|
||||
{
|
||||
struct lp3943 *lp3943 = lp3943_gpio->lp3943;
|
||||
const struct lp3943_reg_cfg *mux = lp3943->mux_cfg;
|
||||
u8 read;
|
||||
int err;
|
||||
|
||||
err = lp3943_read_byte(lp3943, mux[offset].reg, &read);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
read = (read & mux[offset].mask) >> mux[offset].shift;
|
||||
|
||||
if (read == LP3943_GPIO_OUT_HIGH)
|
||||
return 1;
|
||||
else if (read == LP3943_GPIO_OUT_LOW)
|
||||
return 0;
|
||||
else
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int lp3943_gpio_get(struct gpio_chip *chip, unsigned offset)
|
||||
{
|
||||
struct lp3943_gpio *lp3943_gpio = to_lp3943_gpio(chip);
|
||||
|
||||
/*
|
||||
* Limitation:
|
||||
* LP3943 doesn't have the GPIO direction register. It provides
|
||||
* only input and output status registers.
|
||||
* So, direction info is required to handle the 'get' operation.
|
||||
* This variable is updated whenever the direction is changed and
|
||||
* it is used here.
|
||||
*/
|
||||
|
||||
if (lp3943_gpio->input_mask & BIT(offset))
|
||||
return lp3943_get_gpio_in_status(lp3943_gpio, chip, offset);
|
||||
else
|
||||
return lp3943_get_gpio_out_status(lp3943_gpio, chip, offset);
|
||||
}
|
||||
|
||||
static void lp3943_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
|
||||
{
|
||||
struct lp3943_gpio *lp3943_gpio = to_lp3943_gpio(chip);
|
||||
u8 data;
|
||||
|
||||
if (value)
|
||||
data = LP3943_GPIO_OUT_HIGH;
|
||||
else
|
||||
data = LP3943_GPIO_OUT_LOW;
|
||||
|
||||
lp3943_gpio_set_mode(lp3943_gpio, offset, data);
|
||||
}
|
||||
|
||||
static int lp3943_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
|
||||
int value)
|
||||
{
|
||||
struct lp3943_gpio *lp3943_gpio = to_lp3943_gpio(chip);
|
||||
|
||||
lp3943_gpio_set(chip, offset, value);
|
||||
lp3943_gpio->input_mask &= ~BIT(offset);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct gpio_chip lp3943_gpio_chip = {
|
||||
.label = "lp3943",
|
||||
.owner = THIS_MODULE,
|
||||
.request = lp3943_gpio_request,
|
||||
.free = lp3943_gpio_free,
|
||||
.direction_input = lp3943_gpio_direction_input,
|
||||
.get = lp3943_gpio_get,
|
||||
.direction_output = lp3943_gpio_direction_output,
|
||||
.set = lp3943_gpio_set,
|
||||
.base = -1,
|
||||
.ngpio = LP3943_MAX_GPIO,
|
||||
.can_sleep = 1,
|
||||
};
|
||||
|
||||
static int lp3943_gpio_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct lp3943 *lp3943 = dev_get_drvdata(pdev->dev.parent);
|
||||
struct lp3943_gpio *lp3943_gpio;
|
||||
|
||||
lp3943_gpio = devm_kzalloc(&pdev->dev, sizeof(*lp3943_gpio),
|
||||
GFP_KERNEL);
|
||||
if (!lp3943_gpio)
|
||||
return -ENOMEM;
|
||||
|
||||
lp3943_gpio->lp3943 = lp3943;
|
||||
lp3943_gpio->chip = lp3943_gpio_chip;
|
||||
lp3943_gpio->chip.dev = &pdev->dev;
|
||||
|
||||
platform_set_drvdata(pdev, lp3943_gpio);
|
||||
|
||||
return gpiochip_add(&lp3943_gpio->chip);
|
||||
}
|
||||
|
||||
static int lp3943_gpio_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct lp3943_gpio *lp3943_gpio = platform_get_drvdata(pdev);
|
||||
|
||||
return gpiochip_remove(&lp3943_gpio->chip);
|
||||
}
|
||||
|
||||
static const struct of_device_id lp3943_gpio_of_match[] = {
|
||||
{ .compatible = "ti,lp3943-gpio", },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, lp3943_gpio_of_match);
|
||||
|
||||
static struct platform_driver lp3943_gpio_driver = {
|
||||
.probe = lp3943_gpio_probe,
|
||||
.remove = lp3943_gpio_remove,
|
||||
.driver = {
|
||||
.name = "lp3943-gpio",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = lp3943_gpio_of_match,
|
||||
},
|
||||
};
|
||||
module_platform_driver(lp3943_gpio_driver);
|
||||
|
||||
MODULE_DESCRIPTION("LP3943 GPIO driver");
|
||||
MODULE_ALIAS("platform:lp3943-gpio");
|
||||
MODULE_AUTHOR("Milo Kim");
|
||||
MODULE_LICENSE("GPL");
|
||||
Loading…
Reference in a new issue