git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bonding: process the err returned by dev_set_allmulti properly in bond_enslave
[pandora-kernel.git]
/
drivers
/
regulator
/
max8925-regulator.c
diff --git
a/drivers/regulator/max8925-regulator.c
b/drivers/regulator/max8925-regulator.c
index
8ae1475
..
cc9ec0e
100644
(file)
--- a/
drivers/regulator/max8925-regulator.c
+++ b/
drivers/regulator/max8925-regulator.c
@@
-9,6
+9,7
@@
* published by the Free Software Foundation.
*/
#include <linux/kernel.h>
* published by the Free Software Foundation.
*/
#include <linux/kernel.h>
+#include <linux/module.h>
#include <linux/init.h>
#include <linux/err.h>
#include <linux/i2c.h>
#include <linux/init.h>
#include <linux/err.h>
#include <linux/i2c.h>
@@
-23,6
+24,10
@@
#define SD1_DVM_SHIFT 5 /* SDCTL1 bit5 */
#define SD1_DVM_EN 6 /* SDV1 bit 6 */
#define SD1_DVM_SHIFT 5 /* SDCTL1 bit5 */
#define SD1_DVM_EN 6 /* SDV1 bit 6 */
+/* bit definitions in SD & LDO control registers */
+#define OUT_ENABLE 0x1f /* Power U/D sequence as I2C */
+#define OUT_DISABLE 0x1e /* Power U/D sequence as I2C */
+
struct max8925_regulator_info {
struct regulator_desc desc;
struct regulator_dev *regulator;
struct max8925_regulator_info {
struct regulator_desc desc;
struct regulator_dev *regulator;
@@
-93,8
+98,8
@@
static int max8925_enable(struct regulator_dev *rdev)
struct max8925_regulator_info *info = rdev_get_drvdata(rdev);
return max8925_set_bits(info->i2c, info->enable_reg,
struct max8925_regulator_info *info = rdev_get_drvdata(rdev);
return max8925_set_bits(info->i2c, info->enable_reg,
-
1
<< info->enable_bit,
-
1
<< info->enable_bit);
+
OUT_ENABLE
<< info->enable_bit,
+
OUT_ENABLE
<< info->enable_bit);
}
static int max8925_disable(struct regulator_dev *rdev)
}
static int max8925_disable(struct regulator_dev *rdev)
@@
-102,7
+107,8
@@
static int max8925_disable(struct regulator_dev *rdev)
struct max8925_regulator_info *info = rdev_get_drvdata(rdev);
return max8925_set_bits(info->i2c, info->enable_reg,
struct max8925_regulator_info *info = rdev_get_drvdata(rdev);
return max8925_set_bits(info->i2c, info->enable_reg,
- 1 << info->enable_bit, 0);
+ OUT_ENABLE << info->enable_bit,
+ OUT_DISABLE << info->enable_bit);
}
static int max8925_is_enabled(struct regulator_dev *rdev)
}
static int max8925_is_enabled(struct regulator_dev *rdev)