Page MenuHomeFreeBSD
Files F96097613

D44436.diff
No OneTemporary
Actions

D44436.diff
View Options

diff --git a/sys/dev/iicbus/rtc/ds1307.c b/sys/dev/iicbus/rtc/ds1307.c
--- a/sys/dev/iicbus/rtc/ds1307.c
+++ b/sys/dev/iicbus/rtc/ds1307.c
@@ -56,7 +56,7 @@
enum {
TYPE_DS1307,
TYPE_MAXIM1307,
- TYPE_MICROCHIP_MCP7491X,
+ TYPE_MICROCHIP_MCP7941X,
TYPE_EPSON_RX8035,
TYPE_COUNT
};
@@ -75,7 +75,7 @@
static const struct ofw_compat_data ds1307_compat_data[] = {
{"dallas,ds1307", TYPE_DS1307},
{"maxim,ds1307", TYPE_MAXIM1307},
- {"microchip,mcp7941x", TYPE_MICROCHIP_MCP7491X},
+ {"microchip,mcp7941x", TYPE_MICROCHIP_MCP7941X},
{"epson,rx8035", TYPE_EPSON_RX8035},
{ NULL, 0 }
};
@@ -136,7 +136,7 @@
error = ds1307_ctrl_read(sc);
if (error != 0)
return (error);
- if (sc->chiptype == TYPE_MICROCHIP_MCP7491X)
+ if (sc->chiptype == TYPE_MICROCHIP_MCP7941X)
sqwe_bit = MCP7941X_CTRL_SQWE;
else
sqwe_bit = DS1307_CTRL_SQWE;
@@ -233,8 +233,8 @@
case TYPE_MAXIM1307:
device_set_desc(dev, "Maxim DS1307");
break;
- case TYPE_MICROCHIP_MCP7491X:
- device_set_desc(dev, "Microchip MCP7491X");
+ case TYPE_MICROCHIP_MCP7941X:
+ device_set_desc(dev, "Microchip MCP7941X");
break;
case TYPE_EPSON_RX8035:
device_set_desc(dev, "Epson RX-8035");
@@ -382,7 +382,7 @@
}
switch (sc->chiptype) {
- case TYPE_MICROCHIP_MCP7491X:
+ case TYPE_MICROCHIP_MCP7941X:
osc_en = 0x80;
break;
default:
@@ -538,7 +538,7 @@
data[DS1307_WEEKDAY] = bct.dow;
data[DS1307_MONTH] = bct.mon;
data[DS1307_YEAR] = bct.year & 0xff;
- if (sc->chiptype == TYPE_MICROCHIP_MCP7491X) {
+ if (sc->chiptype == TYPE_MICROCHIP_MCP7941X) {
data[DS1307_SECS] |= MCP7941X_SECS_ST;
data[DS1307_WEEKDAY] |= MCP7941X_WEEKDAY_VBATEN;
year = bcd2bin(bct.year >> 8) * 100 + bcd2bin(bct.year & 0xff);

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 24, 4:35 PM (10 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
12678534
Default Alt Text
D44436.diff (1 KB)

Event Timeline