- Rename ds1672 and ds133x devices to "ds1672_rtc" and "ds133x_rtc"

  respectivly. This will allow one to have a kernel with both devices
  present and use it for multiple boards with different types of RTC
  sitting on a bus.

Discussed with:	imp

5 files changed, 8 insertions, 8 deletions

diff --git a/sys/arm/conf/AVILA.hints b/sys/arm/conf/AVILA.hints
index f5a829f..5b8a73b 100644
--- a/sys/arm/conf/AVILA.hints
+++ b/sys/arm/conf/AVILA.hints
@@ -44,5 +44,5 @@ hint.ad7418.0.at="iicbus0"
 hint.ad7418.0.addr=0x50
 
 # Dallas Semiconductor DS1672 RTC
-hint.rtc.0.at="iicbus0"
-hint.rtc.0.addr=0xd0
+hint.ds1672_rtc.0.at="iicbus0"
+hint.ds1672_rtc.0.addr=0xd0
diff --git a/sys/arm/conf/BWCT.hints b/sys/arm/conf/BWCT.hints
index ee55030..105409d 100644
--- a/sys/arm/conf/BWCT.hints
+++ b/sys/arm/conf/BWCT.hints
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 # Dallas Semiconductor DS1672 RTC sitting on the I2C bus
-hint.rtc.0.at="iicbus0"
-hint.rtc.0.addr=0xd0
+hint.ds1672_rtc.0.at="iicbus0"
+hint.ds1672_rtc.0.addr=0xd0
 
 # NAtional Semiconductor LM75 temperature sensor sitting on the I2C bus
 hint.lm75.0.at="iicbus0"
diff --git a/sys/arm/conf/CAMBRIA.hints b/sys/arm/conf/CAMBRIA.hints
index 07db189..bed6d25 100644
--- a/sys/arm/conf/CAMBRIA.hints
+++ b/sys/arm/conf/CAMBRIA.hints
@@ -46,8 +46,8 @@ hint.ad7418.0.at="iicbus0"
 hint.ad7418.0.addr=0x50
 
 # Dallas Semiconductor DS1672 RTC
-hint.rtc.0.at="iicbus0"
-hint.rtc.0.addr=0xd0
+hint.ds1672_rtc.0.at="iicbus0"
+hint.ds1672_rtc.0.addr=0xd0
 
 # USB is part of the chip
 hint.ehci.0.at="ixp0"
diff --git a/sys/dev/iicbus/ds133x.c b/sys/dev/iicbus/ds133x.c
index 31db88e..572384f 100644
--- a/sys/dev/iicbus/ds133x.c
+++ b/sys/dev/iicbus/ds133x.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 #include "iicbus_if.h"
 #include "clock_if.h"
 
-#define DS133X_DEVNAME		"rtc"
+#define DS133X_DEVNAME		"ds133x_rtc"
 
 #define	DS133X_ADDR		0xd0	/* slave address */
 #define	DS133X_DATE_REG		0x0
diff --git a/sys/dev/iicbus/ds1672.c b/sys/dev/iicbus/ds1672.c
index 6cc1524..a9209bd 100644
--- a/sys/dev/iicbus/ds1672.c
+++ b/sys/dev/iicbus/ds1672.c
@@ -171,7 +171,7 @@ static device_method_t ds1672_methods[] = {
 };
 
 static driver_t ds1672_driver = {
-	"rtc",
+	"ds1672_rtc",
 	ds1672_methods,
 	sizeof(struct ds1672_softc),
 };