Author: sbruno
Date: Wed Jul 29 15:32:59 2015
New Revision: 286015
URL: https://svnweb.freebsd.org/changeset/base/286015
Log:
Make Broadcom XLR use shared ds1374 RTC driver.
Remove its identical and redundant ds1374u version.
Differential Revision: D3225
Submitted by: kevin.bowl...@kev009.com
Deleted:
head/sys/mips/rmi/dev/iic/ds1374u.c
Modified:
head/sys/mips/conf/XLR
head/sys/mips/conf/XLR64
head/sys/mips/conf/XLRN32
head/sys/mips/rmi/files.xlr
head/sys/mips/rmi/xlr_i2c.c
Modified: head/sys/mips/conf/XLR
==============================================================================
--- head/sys/mips/conf/XLR Wed Jul 29 14:16:25 2015 (r286014)
+++ head/sys/mips/conf/XLR Wed Jul 29 15:32:59 2015 (r286015)
@@ -135,7 +135,7 @@ device ic
device iic
device iicbb
device iicbus
-device ds1374u # RTC on XLR boards
+device ds1374 # RTC on XLR boards
device max6657 # Temparature sensor on XLR boards
device at24co2n # EEPROM on XLR boards
Modified: head/sys/mips/conf/XLR64
==============================================================================
--- head/sys/mips/conf/XLR64 Wed Jul 29 14:16:25 2015 (r286014)
+++ head/sys/mips/conf/XLR64 Wed Jul 29 15:32:59 2015 (r286015)
@@ -109,7 +109,7 @@ device ic
device iic
device iicbb
device iicbus
-device ds1374u # RTC on XLR boards
+device ds1374 # RTC on XLR boards
device max6657 # Temparature sensor on XLR boards
device at24co2n # EEPROM on XLR boards
Modified: head/sys/mips/conf/XLRN32
==============================================================================
--- head/sys/mips/conf/XLRN32 Wed Jul 29 14:16:25 2015 (r286014)
+++ head/sys/mips/conf/XLRN32 Wed Jul 29 15:32:59 2015 (r286015)
@@ -113,7 +113,7 @@ device ic
device iic
device iicbb
device iicbus
-device ds1374u # RTC on XLR boards
+device ds1374 # RTC on XLR boards
device max6657 # Temparature sensor on XLR boards
device at24co2n # EEPROM on XLR boards
Modified: head/sys/mips/rmi/files.xlr
==============================================================================
--- head/sys/mips/rmi/files.xlr Wed Jul 29 14:16:25 2015 (r286014)
+++ head/sys/mips/rmi/files.xlr Wed Jul 29 15:32:59 2015 (r286015)
@@ -22,6 +22,5 @@ mips/rmi/dev/sec/rmisec.c optional rmi
mips/rmi/dev/sec/rmilib.c optional rmisec
mips/rmi/dev/xlr/rge.c optional rge
mips/rmi/dev/nlge/if_nlge.c optional nlge
-mips/rmi/dev/iic/ds1374u.c optional ds1374u
mips/rmi/dev/iic/max6657.c optional max6657
mips/rmi/dev/iic/at24co2n.c optional at24co2n
Modified: head/sys/mips/rmi/xlr_i2c.c
==============================================================================
--- head/sys/mips/rmi/xlr_i2c.c Wed Jul 29 14:16:25 2015 (r286014)
+++ head/sys/mips/rmi/xlr_i2c.c Wed Jul 29 15:32:59 2015 (r286015)
@@ -187,7 +187,7 @@ xlr_i2c_attach(device_t dev)
return -1;
}
if(xlr_board_info.xlr_i2c_device[I2C_RTC].enabled == 1) {
- tmpd = device_add_child(sc->iicbus, "ds1374u", 0);
+ tmpd = device_add_child(sc->iicbus, "ds1374_rtc", 0);
device_set_ivars(tmpd, &xlr_board_info.xlr_i2c_device[I2C_RTC]);
}
if(xlr_board_info.xlr_i2c_device[I2C_THERMAL].enabled == 1) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
