diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-05 22:04:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-05 22:04:09 -0500 |
commit | 8e128ce3318a147903c893de1891f6c2306f8a61 (patch) | |
tree | 3b45e780570e9beb9ec8e83c677f2d9fd9b458ce /drivers/mfd/da903x.c | |
parent | 0bbb2753584231db364b624bf8cf82551b94da7d (diff) | |
parent | 3f874b6643e189d3d07618928ceed0013d71593e (diff) |
Merge branch 'for-next' of git://git.o-hand.com/linux-mfd
* 'for-next' of git://git.o-hand.com/linux-mfd: (30 commits)
mfd: Fix section mismatch in da903x
mfd: move drivers/i2c/chips/menelaus.c to drivers/mfd
mfd: move drivers/i2c/chips/tps65010.c to drivers/mfd
mfd: dm355evm msp430 driver
mfd: Add missing break from wm3850-core
mfd: Add WM8351 support
mfd: Support configurable numbers of DCDCs and ISINKs on WM8350
mfd: Handle missing WM8350 platform data
mfd: Add WM8352 support
mfd: Use irq_to_desc in twl4030 code
power_supply: Add Dialog DA9030 battery charger driver
mfd: Dialog DA9030 battery charger MFD driver
mfd: Register WM8400 codec device
mfd: Pass driver_data onto child devices
mfd: Fix twl4030-core.c build error
mfd: twl4030 regulator bug fixes
mfd: twl4030: create some regulator devices
mfd: twl4030: cleanup symbols and OMAP dependency
mfd: twl4030: simplified child creation code
power_supply: Add battery health reporting for WM8350
...
Diffstat (limited to 'drivers/mfd/da903x.c')
-rw-r--r-- | drivers/mfd/da903x.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c index 0b5bd85dfcec..99f8dcfe3d98 100644 --- a/drivers/mfd/da903x.c +++ b/drivers/mfd/da903x.c | |||
@@ -151,12 +151,24 @@ int da903x_write(struct device *dev, int reg, uint8_t val) | |||
151 | } | 151 | } |
152 | EXPORT_SYMBOL_GPL(da903x_write); | 152 | EXPORT_SYMBOL_GPL(da903x_write); |
153 | 153 | ||
154 | int da903x_writes(struct device *dev, int reg, int len, uint8_t *val) | ||
155 | { | ||
156 | return __da903x_writes(to_i2c_client(dev), reg, len, val); | ||
157 | } | ||
158 | EXPORT_SYMBOL_GPL(da903x_writes); | ||
159 | |||
154 | int da903x_read(struct device *dev, int reg, uint8_t *val) | 160 | int da903x_read(struct device *dev, int reg, uint8_t *val) |
155 | { | 161 | { |
156 | return __da903x_read(to_i2c_client(dev), reg, val); | 162 | return __da903x_read(to_i2c_client(dev), reg, val); |
157 | } | 163 | } |
158 | EXPORT_SYMBOL_GPL(da903x_read); | 164 | EXPORT_SYMBOL_GPL(da903x_read); |
159 | 165 | ||
166 | int da903x_reads(struct device *dev, int reg, int len, uint8_t *val) | ||
167 | { | ||
168 | return __da903x_reads(to_i2c_client(dev), reg, len, val); | ||
169 | } | ||
170 | EXPORT_SYMBOL_GPL(da903x_reads); | ||
171 | |||
160 | int da903x_set_bits(struct device *dev, int reg, uint8_t bit_mask) | 172 | int da903x_set_bits(struct device *dev, int reg, uint8_t bit_mask) |
161 | { | 173 | { |
162 | struct da903x_chip *chip = dev_get_drvdata(dev); | 174 | struct da903x_chip *chip = dev_get_drvdata(dev); |
@@ -435,13 +447,13 @@ static const struct i2c_device_id da903x_id_table[] = { | |||
435 | }; | 447 | }; |
436 | MODULE_DEVICE_TABLE(i2c, da903x_id_table); | 448 | MODULE_DEVICE_TABLE(i2c, da903x_id_table); |
437 | 449 | ||
438 | static int __devexit __remove_subdev(struct device *dev, void *unused) | 450 | static int __remove_subdev(struct device *dev, void *unused) |
439 | { | 451 | { |
440 | platform_device_unregister(to_platform_device(dev)); | 452 | platform_device_unregister(to_platform_device(dev)); |
441 | return 0; | 453 | return 0; |
442 | } | 454 | } |
443 | 455 | ||
444 | static int __devexit da903x_remove_subdevs(struct da903x_chip *chip) | 456 | static int da903x_remove_subdevs(struct da903x_chip *chip) |
445 | { | 457 | { |
446 | return device_for_each_child(chip->dev, NULL, __remove_subdev); | 458 | return device_for_each_child(chip->dev, NULL, __remove_subdev); |
447 | } | 459 | } |