summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Zeh <werner.zeh@siemens.com>2016-12-13 08:03:10 +0100
committerMartin Roth <martinroth@google.com>2016-12-15 04:11:06 +0100
commitf1f322b1a883e3d50a1907e29b5aa333a0f795a8 (patch)
tree2956a9fc585c93f0e1d7cda88550d1a1bd3c790f
parent6bc44169680816e137ad9450f404c8463e7eb9d9 (diff)
downloadcoreboot-f1f322b1a883e3d50a1907e29b5aa333a0f795a8.tar.xz
pcf8523: Fix wrong initialization of several registers
In the case where the RTC is initialized after the battery is completely drained the bits for power_mode and cof_selection are set up with wrongly applied masks. In the case where the RTC is re-initialized again with no power-loss after the last initialization the bits for cap_sel, power_mode and cof_selection are not shifted to the right position. Both errors lead to a wrong initialization of the RTC and in turn to a way larger current consumption (instead of 120 nA the RTC current rises to over 2 µA). This patch fixes both errors and the current consumption is in the right range again. TEST=booted mc_bdx1 and verified current consumption of RTC Change-Id: I8594f6ac121a175844393952db2169dbc5cbd2b2 Signed-off-by: Werner Zeh <werner.zeh@siemens.com> Reviewed-on: https://review.coreboot.org/17829 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Martin Roth <martinroth@google.com>
-rw-r--r--src/drivers/i2c/pcf8523/pcf8523.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/drivers/i2c/pcf8523/pcf8523.c b/src/drivers/i2c/pcf8523/pcf8523.c
index eb0bf25123..416499bce5 100644
--- a/src/drivers/i2c/pcf8523/pcf8523.c
+++ b/src/drivers/i2c/pcf8523/pcf8523.c
@@ -63,15 +63,15 @@ static void pcf8523_init(struct device *dev)
* corrupted and OS bit was not set. */
reg = smbus_read_byte(dev, CTRL_REG_1);
reg &= ~(STOP_BIT | CAP_SEL);
- reg |= config->cap_sel;
+ reg |= ((!!config->cap_sel) << 7);
smbus_write_byte(dev, CTRL_REG_1, reg);
reg = smbus_read_byte(dev, CTRL_REG_3);
reg &= ~PM_MASK;
- reg |= config->power_mode;
+ reg |= ((config->power_mode & 0x07) << 5);
smbus_write_byte(dev, CTRL_REG_3, reg);
reg = smbus_read_byte(dev, TMR_CLKOUT_REG);
reg &= ~COF_MASK;
- reg |= config->cof_selection;
+ reg |= ((config->cof_selection & 0x07) << 3);
smbus_write_byte(dev, TMR_CLKOUT_REG, reg);
return;
}
@@ -87,7 +87,7 @@ static void pcf8523_init(struct device *dev)
((!!config->tmrA_int_en) << 1) |
(!!config->tmrB_int_en));
- smbus_write_byte(dev, CTRL_REG_3, ((config->power_mode & 0x03) << 5) |
+ smbus_write_byte(dev, CTRL_REG_3, ((config->power_mode & 0x07) << 5) |
((!!config->bat_switch_int_en) << 1) |
(!!config->bat_low_int_en));
@@ -96,7 +96,7 @@ static void pcf8523_init(struct device *dev)
smbus_write_byte(dev, TMR_CLKOUT_REG, ((!!config->tmrA_int_mode) << 7) |
((!!config->tmrB_int_mode) << 6) |
- ((config->cof_selection & 0x38) << 3) |
+ ((config->cof_selection & 0x07) << 3) |
((config->tmrA_mode & 0x03) << 1) |
(!!config->tmrB_mode));