diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-22 01:17:27 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-22 01:17:27 +0200 |
| commit | bfbc344732badffe94f096f929e4a105b3b92d1f (patch) | |
| tree | f4fc6c06108495bd2c33ecff68c065514e66a8cc /drivers/power | |
| parent | Linux 3.15-rc1 (diff) | |
| parent | regulator: bcm590xx: Add support for regulators on secondary I2C slave (diff) | |
| download | linux-bfbc344732badffe94f096f929e4a105b3b92d1f.tar.xz linux-bfbc344732badffe94f096f929e4a105b3b92d1f.zip | |
Merge tag 'mfd-regulator-v3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-bcm590xxx
Immutable branch between MFD and Regulator due for v3.16 merge-window.
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/tps65090-charger.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/power/tps65090-charger.c b/drivers/power/tps65090-charger.c index 8fc9d6df87f6..1685f63b9e5d 100644 --- a/drivers/power/tps65090-charger.c +++ b/drivers/power/tps65090-charger.c @@ -28,17 +28,6 @@ #include <linux/mfd/tps65090.h> -#define TPS65090_REG_INTR_STS 0x00 -#define TPS65090_REG_INTR_MASK 0x02 -#define TPS65090_REG_CG_CTRL0 0x04 -#define TPS65090_REG_CG_CTRL1 0x05 -#define TPS65090_REG_CG_CTRL2 0x06 -#define TPS65090_REG_CG_CTRL3 0x07 -#define TPS65090_REG_CG_CTRL4 0x08 -#define TPS65090_REG_CG_CTRL5 0x09 -#define TPS65090_REG_CG_STATUS1 0x0a -#define TPS65090_REG_CG_STATUS2 0x0b - #define TPS65090_CHARGER_ENABLE BIT(0) #define TPS65090_VACG BIT(1) #define TPS65090_NOITERM BIT(5) |