projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
[linux-2.6-microblaze.git]
/
drivers
/
mfd
/
da9052-i2c.c
diff --git
a/drivers/mfd/da9052-i2c.c
b/drivers/mfd/da9052-i2c.c
index
6a9fec4
..
c319c4e
100644
(file)
--- a/
drivers/mfd/da9052-i2c.c
+++ b/
drivers/mfd/da9052-i2c.c
@@
-86,7
+86,11
@@
static int da9052_i2c_fix(struct da9052 *da9052, unsigned char reg)
return 0;
}
return 0;
}
-static int da9052_i2c_enable_multiwrite(struct da9052 *da9052)
+/*
+ * According to errata item 24, multiwrite mode should be avoided
+ * in order to prevent register data corruption after power-down.
+ */
+static int da9052_i2c_disable_multiwrite(struct da9052 *da9052)
{
int reg_val, ret;
{
int reg_val, ret;
@@
-94,8
+98,8
@@
static int da9052_i2c_enable_multiwrite(struct da9052 *da9052)
if (ret < 0)
return ret;
if (ret < 0)
return ret;
- if (
reg_val & DA9052_CONTROL_B_WRITEMODE
) {
- reg_val
&= ~
DA9052_CONTROL_B_WRITEMODE;
+ if (
!(reg_val & DA9052_CONTROL_B_WRITEMODE)
) {
+ reg_val
|=
DA9052_CONTROL_B_WRITEMODE;
ret = regmap_write(da9052->regmap, DA9052_CONTROL_B_REG,
reg_val);
if (ret < 0)
ret = regmap_write(da9052->regmap, DA9052_CONTROL_B_REG,
reg_val);
if (ret < 0)
@@
-154,7
+158,7
@@
static int da9052_i2c_probe(struct i2c_client *client,
return ret;
}
return ret;
}
- ret = da9052_i2c_
en
able_multiwrite(da9052);
+ ret = da9052_i2c_
dis
able_multiwrite(da9052);
if (ret < 0)
return ret;
if (ret < 0)
return ret;