diff options
| author | jmcneill <jmcneill@NetBSD.org> | 2015-01-11 18:05:36 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@NetBSD.org> | 2015-01-11 18:05:36 +0000 |
| commit | 31a717c1007eff2e6f7097ceea15d96397640e41 (patch) | |
| tree | f6980419f13e84a7af2f0616c5198794de9e8fb3 /sys/dev/i2c | |
| parent | 2ff19b02ee2e3b6499dc24c5ee4c30c1382cfb28 (diff) | |
initialize CS1/CS2 regs, honour century flag, return an error on read if voltage low bit is set
Diffstat (limited to 'sys/dev/i2c')
| -rw-r--r-- | sys/dev/i2c/pcf8563.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/sys/dev/i2c/pcf8563.c b/sys/dev/i2c/pcf8563.c index b8a410e92c6..79437a98414 100644 --- a/sys/dev/i2c/pcf8563.c +++ b/sys/dev/i2c/pcf8563.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcf8563.c,v 1.4 2014/11/20 16:34:26 christos Exp $ */ +/* $NetBSD: pcf8563.c,v 1.5 2015/01/11 18:05:36 jmcneill Exp $ */ /* * Copyright (c) 2011 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcf8563.c,v 1.4 2014/11/20 16:34:26 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcf8563.c,v 1.5 2015/01/11 18:05:36 jmcneill Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -91,6 +91,13 @@ pcf8563rtc_attach(device_t parent, device_t self, void *aux) sc->sc_todr.todr_settime_ymdhms = pcf8563rtc_settime; sc->sc_todr.todr_setwen = NULL; + iic_acquire_bus(sc->sc_tag, I2C_F_POLL); + iic_smbus_write_byte(sc->sc_tag, sc->sc_addr, PCF8563_R_CS1, 0, + I2C_F_POLL); + iic_smbus_write_byte(sc->sc_tag, sc->sc_addr, PCF8563_R_CS2, 0, + I2C_F_POLL); + iic_release_bus(sc->sc_tag, I2C_F_POLL); + todr_attach(&sc->sc_todr); } @@ -136,13 +143,18 @@ pcf8563rtc_clock_read(struct pcf8563rtc_softc *sc, struct clock_ymdhms *dt) iic_release_bus(sc->sc_tag, I2C_F_POLL); + if (bcd[PCF8563_R_SECOND] & PCF8563_M_VL) + return 0; + dt->dt_sec = bcdtobin(bcd[PCF8563_R_SECOND] & PCF8563_M_SECOND); dt->dt_min = bcdtobin(bcd[PCF8563_R_MINUTE] & PCF8563_M_MINUTE); dt->dt_hour = bcdtobin(bcd[PCF8563_R_HOUR] & PCF8563_M_HOUR); dt->dt_day = bcdtobin(bcd[PCF8563_R_DAY] & PCF8563_M_DAY); dt->dt_mon = bcdtobin(bcd[PCF8563_R_MONTH] & PCF8563_M_MONTH); - dt->dt_year = bcdtobin(bcd[PCF8563_R_YEAR] & PCF8563_M_YEAR); - dt->dt_year += 2000; + dt->dt_year = 1900 + + (bcdtobin(bcd[PCF8563_R_YEAR] & PCF8563_M_YEAR) % 100); + if (bcd[PCF8563_R_MONTH] & PCF8563_M_CENTURY) + dt->dt_year += 100; return 1; } @@ -160,6 +172,8 @@ pcf8563rtc_clock_write(struct pcf8563rtc_softc *sc, struct clock_ymdhms *dt) bcd[PCF8563_R_WEEKDAY] = bintobcd(dt->dt_wday); bcd[PCF8563_R_MONTH] = bintobcd(dt->dt_mon); bcd[PCF8563_R_YEAR] = bintobcd(dt->dt_year % 100); + if (dt->dt_year >= 2000) + bcd[PCF8563_R_MONTH] |= PCF8563_M_CENTURY; if (iic_acquire_bus(sc->sc_tag, I2C_F_POLL)) { device_printf(sc->sc_dev, "acquire bus for write failed\n"); |
