| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: pcf8563.c,v 1.6 2015/01/11 18:58:09 jmcneill Exp $ */ | | 1 | /* $NetBSD: pcf8563.c,v 1.7 2015/04/11 20:05:44 joerg Exp $ */ |
2 | | | 2 | |
3 | /* | | 3 | /* |
4 | * Copyright (c) 2011 Jonathan A. Kollasch | | 4 | * Copyright (c) 2011 Jonathan A. Kollasch |
5 | * All rights reserved. | | 5 | * All rights reserved. |
6 | * | | 6 | * |
7 | * Redistribution and use in source and binary forms, with or without | | 7 | * Redistribution and use in source and binary forms, with or without |
8 | * modification, are permitted provided that the following conditions | | 8 | * modification, are permitted provided that the following conditions |
9 | * are met: | | 9 | * are met: |
10 | * 1. Redistributions of source code must retain the above copyright | | 10 | * 1. Redistributions of source code must retain the above copyright |
11 | * notice, this list of conditions and the following disclaimer. | | 11 | * notice, this list of conditions and the following disclaimer. |
12 | * 2. Redistributions in binary form must reproduce the above copyright | | 12 | * 2. Redistributions in binary form must reproduce the above copyright |
13 | * notice, this list of conditions and the following disclaimer in the | | 13 | * notice, this list of conditions and the following disclaimer in the |
14 | * documentation and/or other materials provided with the distribution. | | 14 | * documentation and/or other materials provided with the distribution. |
| @@ -17,27 +17,27 @@ | | | @@ -17,27 +17,27 @@ |
17 | * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | | 17 | * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED |
18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | | 18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR | | 19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR |
20 | * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | | 20 | * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
21 | * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | | 21 | * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
22 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | | 22 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
23 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | | 23 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
24 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | | 24 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
25 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | | 25 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
26 | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | | 26 | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | */ | | 27 | */ |
28 | | | 28 | |
29 | #include <sys/cdefs.h> | | 29 | #include <sys/cdefs.h> |
30 | __KERNEL_RCSID(0, "$NetBSD: pcf8563.c,v 1.6 2015/01/11 18:58:09 jmcneill Exp $"); | | 30 | __KERNEL_RCSID(0, "$NetBSD: pcf8563.c,v 1.7 2015/04/11 20:05:44 joerg Exp $"); |
31 | | | 31 | |
32 | #include <sys/param.h> | | 32 | #include <sys/param.h> |
33 | #include <sys/systm.h> | | 33 | #include <sys/systm.h> |
34 | #include <sys/device.h> | | 34 | #include <sys/device.h> |
35 | #include <sys/kernel.h> | | 35 | #include <sys/kernel.h> |
36 | | | 36 | |
37 | #include <dev/clock_subr.h> | | 37 | #include <dev/clock_subr.h> |
38 | | | 38 | |
39 | #include <dev/i2c/i2cvar.h> | | 39 | #include <dev/i2c/i2cvar.h> |
40 | #include <dev/i2c/pcf8563reg.h> | | 40 | #include <dev/i2c/pcf8563reg.h> |
41 | | | 41 | |
42 | struct pcf8563rtc_softc { | | 42 | struct pcf8563rtc_softc { |
43 | device_t sc_dev; | | 43 | device_t sc_dev; |
| @@ -118,27 +118,27 @@ pcf8563rtc_settime(struct todr_chip_hand | | | @@ -118,27 +118,27 @@ pcf8563rtc_settime(struct todr_chip_hand |
118 | struct pcf8563rtc_softc *sc = ch->cookie; | | 118 | struct pcf8563rtc_softc *sc = ch->cookie; |
119 | | | 119 | |
120 | if (pcf8563rtc_clock_write(sc, dt) == 0) | | 120 | if (pcf8563rtc_clock_write(sc, dt) == 0) |
121 | return -1; | | 121 | return -1; |
122 | | | 122 | |
123 | return 0; | | 123 | return 0; |
124 | } | | 124 | } |
125 | | | 125 | |
126 | static int | | 126 | static int |
127 | pcf8563rtc_clock_read(struct pcf8563rtc_softc *sc, struct clock_ymdhms *dt) | | 127 | pcf8563rtc_clock_read(struct pcf8563rtc_softc *sc, struct clock_ymdhms *dt) |
128 | { | | 128 | { |
129 | uint8_t bcd[PCF8563_NREGS]; | | 129 | uint8_t bcd[PCF8563_NREGS]; |
130 | uint8_t reg = PCF8563_R_SECOND; | | 130 | uint8_t reg = PCF8563_R_SECOND; |
131 | const int flags = cold ? I2C_F_POLL : 0; | | 131 | const int flags = I2C_F_POLL; |
132 | | | 132 | |
133 | if (iic_acquire_bus(sc->sc_tag, flags)) { | | 133 | if (iic_acquire_bus(sc->sc_tag, flags)) { |
134 | device_printf(sc->sc_dev, "acquire bus for read failed\n"); | | 134 | device_printf(sc->sc_dev, "acquire bus for read failed\n"); |
135 | return 0; | | 135 | return 0; |
136 | } | | 136 | } |
137 | | | 137 | |
138 | if (iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_addr, ®, 1, | | 138 | if (iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_addr, ®, 1, |
139 | &bcd[reg], PCF8563_R_YEAR - reg + 1, flags)) { | | 139 | &bcd[reg], PCF8563_R_YEAR - reg + 1, flags)) { |
140 | iic_release_bus(sc->sc_tag, flags); | | 140 | iic_release_bus(sc->sc_tag, flags); |
141 | device_printf(sc->sc_dev, "read failed\n"); | | 141 | device_printf(sc->sc_dev, "read failed\n"); |
142 | return 0; | | 142 | return 0; |
143 | } | | 143 | } |
144 | | | 144 | |
| @@ -156,27 +156,27 @@ pcf8563rtc_clock_read(struct pcf8563rtc_ | | | @@ -156,27 +156,27 @@ pcf8563rtc_clock_read(struct pcf8563rtc_ |
156 | dt->dt_year = 1900 + | | 156 | dt->dt_year = 1900 + |
157 | (bcdtobin(bcd[PCF8563_R_YEAR] & PCF8563_M_YEAR) % 100); | | 157 | (bcdtobin(bcd[PCF8563_R_YEAR] & PCF8563_M_YEAR) % 100); |
158 | if ((bcd[PCF8563_R_MONTH] & PCF8563_M_CENTURY) == 0) | | 158 | if ((bcd[PCF8563_R_MONTH] & PCF8563_M_CENTURY) == 0) |
159 | dt->dt_year += 100; | | 159 | dt->dt_year += 100; |
160 | | | 160 | |
161 | return 1; | | 161 | return 1; |
162 | } | | 162 | } |
163 | | | 163 | |
164 | static int | | 164 | static int |
165 | pcf8563rtc_clock_write(struct pcf8563rtc_softc *sc, struct clock_ymdhms *dt) | | 165 | pcf8563rtc_clock_write(struct pcf8563rtc_softc *sc, struct clock_ymdhms *dt) |
166 | { | | 166 | { |
167 | uint8_t bcd[PCF8563_NREGS]; | | 167 | uint8_t bcd[PCF8563_NREGS]; |
168 | uint8_t reg = PCF8563_R_SECOND; | | 168 | uint8_t reg = PCF8563_R_SECOND; |
169 | const int flags = cold ? I2C_F_POLL : 0; | | 169 | const int flags = I2C_F_POLL; |
170 | | | 170 | |
171 | bcd[PCF8563_R_SECOND] = bintobcd(dt->dt_sec); | | 171 | bcd[PCF8563_R_SECOND] = bintobcd(dt->dt_sec); |
172 | bcd[PCF8563_R_MINUTE] = bintobcd(dt->dt_min); | | 172 | bcd[PCF8563_R_MINUTE] = bintobcd(dt->dt_min); |
173 | bcd[PCF8563_R_HOUR] = bintobcd(dt->dt_hour); | | 173 | bcd[PCF8563_R_HOUR] = bintobcd(dt->dt_hour); |
174 | bcd[PCF8563_R_DAY] = bintobcd(dt->dt_day); | | 174 | bcd[PCF8563_R_DAY] = bintobcd(dt->dt_day); |
175 | bcd[PCF8563_R_WEEKDAY] = bintobcd(dt->dt_wday); | | 175 | bcd[PCF8563_R_WEEKDAY] = bintobcd(dt->dt_wday); |
176 | bcd[PCF8563_R_MONTH] = bintobcd(dt->dt_mon); | | 176 | bcd[PCF8563_R_MONTH] = bintobcd(dt->dt_mon); |
177 | bcd[PCF8563_R_YEAR] = bintobcd(dt->dt_year % 100); | | 177 | bcd[PCF8563_R_YEAR] = bintobcd(dt->dt_year % 100); |
178 | if (dt->dt_year < 2000) | | 178 | if (dt->dt_year < 2000) |
179 | bcd[PCF8563_R_MONTH] |= PCF8563_M_CENTURY; | | 179 | bcd[PCF8563_R_MONTH] |= PCF8563_M_CENTURY; |
180 | | | 180 | |
181 | if (iic_acquire_bus(sc->sc_tag, flags)) { | | 181 | if (iic_acquire_bus(sc->sc_tag, flags)) { |
182 | device_printf(sc->sc_dev, "acquire bus for write failed\n"); | | 182 | device_printf(sc->sc_dev, "acquire bus for write failed\n"); |