diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 16:19:10 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 16:19:10 -0500 |
commit | 15333539a9b3022656f815f643a77f6b054b335f (patch) | |
tree | 2c5eabbd1ba12a0bd33e8f10c32847f88567d681 /drivers/mfd/sec-core.c | |
parent | bb1b64908f5a346b0654f02999e1a022a7e0c07d (diff) | |
parent | 07b19808486054f356dbf3495a277f51af062b35 (diff) |
Merge tag 'regulator-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown:
"A respin of the merges in the previous pull request with one extra
fix.
A quiet release for the regulator API, quite a large number of small
improvements all over but other than the addition of new drivers for
the AS3722 and MAX14577 there is nothing of substantial non-local
impact"
* tag 'regulator-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (47 commits)
regulator: pfuze100-regulator: Improve dev_info() message
regulator: pfuze100-regulator: Fix some checkpatch complaints
regulator: twl: Fix checkpatch issue
regulator: core: Fix checkpatch issue
regulator: anatop-regulator: Remove unneeded memset()
regulator: s5m8767: Update LDO index in s5m8767-regulator.txt
regulator: as3722: set enable time for SD0/1/6
regulator: as3722: detect SD0 low-voltage mode
regulator: tps62360: Fix up a pointer-integer size mismatch warning
regulator: anatop-regulator: Remove unneeded kstrdup()
regulator: act8865: Fix build error when !OF
regulator: act8865: register all regulators regardless of how many are used
regulator: wm831x-dcdc: Remove unneeded 'err' label
regulator: anatop-regulator: Add MODULE_ALIAS()
regulator: act8865: fix incorrect devm_kzalloc for act8865
regulator: act8865: Remove set_suspend_[en|dis]able implementation
regulator: act8865: Remove unneeded regulator_unregister() calls
regulator: s2mps11: Clean up redundant code
regulator: tps65910: Simplify setting enable_mask for regulators
regulator: act8865: add device tree binding doc
...
Diffstat (limited to 'drivers/mfd/sec-core.c')
-rw-r--r-- | drivers/mfd/sec-core.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c index e4671088f075..a139798b8065 100644 --- a/drivers/mfd/sec-core.c +++ b/drivers/mfd/sec-core.c | |||
@@ -81,36 +81,6 @@ static struct of_device_id sec_dt_match[] = { | |||
81 | }; | 81 | }; |
82 | #endif | 82 | #endif |
83 | 83 | ||
84 | int sec_reg_read(struct sec_pmic_dev *sec_pmic, u8 reg, void *dest) | ||
85 | { | ||
86 | return regmap_read(sec_pmic->regmap_pmic, reg, dest); | ||
87 | } | ||
88 | EXPORT_SYMBOL_GPL(sec_reg_read); | ||
89 | |||
90 | int sec_bulk_read(struct sec_pmic_dev *sec_pmic, u8 reg, int count, u8 *buf) | ||
91 | { | ||
92 | return regmap_bulk_read(sec_pmic->regmap_pmic, reg, buf, count); | ||
93 | } | ||
94 | EXPORT_SYMBOL_GPL(sec_bulk_read); | ||
95 | |||
96 | int sec_reg_write(struct sec_pmic_dev *sec_pmic, u8 reg, u8 value) | ||
97 | { | ||
98 | return regmap_write(sec_pmic->regmap_pmic, reg, value); | ||
99 | } | ||
100 | EXPORT_SYMBOL_GPL(sec_reg_write); | ||
101 | |||
102 | int sec_bulk_write(struct sec_pmic_dev *sec_pmic, u8 reg, int count, u8 *buf) | ||
103 | { | ||
104 | return regmap_raw_write(sec_pmic->regmap_pmic, reg, buf, count); | ||
105 | } | ||
106 | EXPORT_SYMBOL_GPL(sec_bulk_write); | ||
107 | |||
108 | int sec_reg_update(struct sec_pmic_dev *sec_pmic, u8 reg, u8 val, u8 mask) | ||
109 | { | ||
110 | return regmap_update_bits(sec_pmic->regmap_pmic, reg, mask, val); | ||
111 | } | ||
112 | EXPORT_SYMBOL_GPL(sec_reg_update); | ||
113 | |||
114 | static bool s2mps11_volatile(struct device *dev, unsigned int reg) | 84 | static bool s2mps11_volatile(struct device *dev, unsigned int reg) |
115 | { | 85 | { |
116 | switch (reg) { | 86 | switch (reg) { |