Date: Thu, 18 Jul 2019 01:30:56 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r350104 - head/sys/dev/iicbus Message-ID: <201907180130.x6I1Uui6009531@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Thu Jul 18 01:30:56 2019 New Revision: 350104 URL: https://svnweb.freebsd.org/changeset/base/350104 Log: Handle the PCF2127 RTC chip the same as PCF2129 when init'ing the chip. This affects the detection of 24-hour vs AM/PM mode... the ampm bit is in a different location on 2127 and 2129 chips compared to other nxp rtc chips. I noticed the 2127 case wasn't being handled correctly when I accidentally misconfiged my system by claiming my PCF2129 was a 2127. Modified: head/sys/dev/iicbus/nxprtc.c Modified: head/sys/dev/iicbus/nxprtc.c ============================================================================== --- head/sys/dev/iicbus/nxprtc.c Thu Jul 18 00:27:28 2019 (r350103) +++ head/sys/dev/iicbus/nxprtc.c Thu Jul 18 01:30:56 2019 (r350104) @@ -351,9 +351,18 @@ pcf8523_start(struct nxprtc_softc *sc) { int err; uint8_t cs1, cs3, clkout; - bool is2129; + bool is212x; - is2129 = (sc->chiptype == TYPE_PCA2129 || sc->chiptype == TYPE_PCF2129); + switch (sc->chiptype) { + case TYPE_PCF2127: + case TYPE_PCA2129: + case TYPE_PCF2129: + is212x = true; + break; + default: + is212x = true; + break; + } /* Read and sanity-check the control registers. */ if ((err = read_reg(sc, PCF85xx_R_CS1, &cs1)) != 0) { @@ -389,7 +398,7 @@ pcf8523_start(struct nxprtc_softc *sc) * to zero then back to 1, then wait 100ms for the refresh, and * finally set the bit back to zero with the COF_HIGHZ write. */ - if (is2129) { + if (is212x) { clkout = PCF2129_B_CLKOUT_HIGHZ; if ((err = write_reg(sc, PCF8523_R_TMR_CLKOUT, clkout)) != 0) { @@ -429,7 +438,7 @@ pcf8523_start(struct nxprtc_softc *sc) device_printf(sc->dev, "WARNING: RTC battery is low\n"); /* Remember whether we're running in AM/PM mode. */ - if (is2129) { + if (is212x) { if (cs1 & PCF2129_B_CS1_12HR) sc->use_ampm = true; } else {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907180130.x6I1Uui6009531>