Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the "strtc" device to "m41t81rtc" so that it doesn't conflict with 

the MI i2c "strtc" device.
XXX: This should use the MI "strtc" device - the M41T81 should be
     compatible enough with the M41ST84 currently supported by that
     driver.
This commit is contained in:
simonb 2003-10-25 15:05:00 +00:00
parent aa16c3e512
commit 49a8cd4e3a
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/mips/conf/files.sibyte
View File

@ -70,7 +70,7 @@ file arch/mips/sibyte/dev/sbsmbus.c smbus
device xirtc
attach xirtc at smbus
device strtc
attach strtc at smbus
device m41t81rtc
attach m41t81rtc at smbus
file arch/sbmips/sbmips/rtc.c xirtc | strtc
file arch/sbmips/sbmips/rtc.c xirtc | m41t81rtc

6
sys/arch/sbmips/conf/GENERIC
View File

@ -1,10 +1,10 @@
# $NetBSD: GENERIC,v 1.22 2003/10/25 13:21:13 simonb Exp $
# $NetBSD: GENERIC,v 1.23 2003/10/25 15:05:00 simonb Exp $
include "arch/sbmips/conf/std.sbmips"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.22 $"
#ident "GENERIC-$Revision: 1.23 $"
#options LOCKDEBUG # XXX XXX XXX XXX
options DEBUG # extra kernel debugging support
@ -127,7 +127,7 @@ sbscn* at sbobio? offset ?
smbus* at sbobio? offset ?
xirtc* at smbus? chan ? dev ? # Xicor X1241 RTC
strtc* at smbus? chan ? dev ? # ST M41T81 RTC
m41t81rtc* at smbus? chan ? dev ? # ST M41T81 RTC
# MII/PHY support
brgphy* at mii? phy ?

6
sys/arch/sbmips/sbmips/rtc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtc.c,v 1.8 2003/07/15 03:35:51 lukem Exp $ */
/* $NetBSD: rtc.c,v 1.9 2003/10/25 15:05:00 simonb Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.8 2003/07/15 03:35:51 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.9 2003/10/25 15:05:00 simonb Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -96,7 +96,7 @@ static int time_writertc(int, int, int, int, int);
CFATTACH_DECL(xirtc, sizeof(struct rtc_softc),
xirtc_match, xirtc_attach, NULL, NULL);
CFATTACH_DECL(strtc, sizeof(struct rtc_softc),
CFATTACH_DECL(m41t81rtc, sizeof(struct rtc_softc),
strtc_match, strtc_attach, NULL, NULL);
static int rtcfound = 0;