summaryrefslogtreecommitdiff
path: root/sys/arch/loongson/conf
diff options
context:
space:
mode:
authorPatrick Wildt <patrick@cvs.openbsd.org>2020-09-30 22:23:42 +0000
committerPatrick Wildt <patrick@cvs.openbsd.org>2020-09-30 22:23:42 +0000
commitf4aa307936fa87d76580027c0c246301d8c56f96 (patch)
tree5a2560a7210a1ff606c24c2302471ce364f0d98c /sys/arch/loongson/conf
parenta1be6f4caeb2f2afd6ba19aba340a80687d187bd (diff)
Move mfokclock(4) from loongson to sys/dev/i2c so that it be used by more
platforms than just loongson. Rename it to mfokrtc(4) for consistency with other RTC drivers. Make it match on st,m41t83, since that was the chip for which the driver was written for. More compatible strings can be added for each chip of the series verified to behave the same. Discussed with kettenis@ Compile tested on loongson by kn@ Tested on loongson by and ok visa@
Diffstat (limited to 'sys/arch/loongson/conf')
-rw-r--r--sys/arch/loongson/conf/GENERIC4
-rw-r--r--sys/arch/loongson/conf/RAMDISK4
-rw-r--r--sys/arch/loongson/conf/files.loongson7
3 files changed, 5 insertions, 10 deletions
diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC
index 32f10728769..d8a84c570b8 100644
--- a/sys/arch/loongson/conf/GENERIC
+++ b/sys/arch/loongson/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.61 2019/12/17 13:08:55 reyk Exp $
+# $OpenBSD: GENERIC,v 1.62 2020/09/30 22:23:41 patrick Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -74,7 +74,7 @@ gdiumiic0 at gpio0 offset 46 mask 0x03 # pins 46 and 47
iic0 at gdiumiic0
stsec0 at iic0 # ST7 Embedded Controller
lmtemp0 at iic0 # National Semiconductor LM75
-mfokclock0 at iic0 # M41T8x todclock
+mfokrtc0 at iic0 # M41T8x RTC
#iic* at voyager?
ohci* at voyager?
smfb* at voyager?
diff --git a/sys/arch/loongson/conf/RAMDISK b/sys/arch/loongson/conf/RAMDISK
index 31514141754..cd5ee32b4b6 100644
--- a/sys/arch/loongson/conf/RAMDISK
+++ b/sys/arch/loongson/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.31 2019/09/04 14:29:42 cheloha Exp $
+# $OpenBSD: RAMDISK,v 1.32 2020/09/30 22:23:41 patrick Exp $
machine loongson mips64
maxusers 4
@@ -61,7 +61,7 @@ gpio0 at voyager?
gdiumiic0 at gpio0 offset 6 mask 0x81 # pins 6 and 13
gdiumiic0 at gpio0 offset 46 mask 0x03 # pins 46 and 47
iic0 at gdiumiic0
-mfokclock0 at iic0 # M41T8x todclock
+mfokrtc0 at iic0 # M41T8x RTC
ohci* at voyager?
smfb* at voyager?
wsdisplay* at smfb?
diff --git a/sys/arch/loongson/conf/files.loongson b/sys/arch/loongson/conf/files.loongson
index c28f4b5b5c3..6b3b2854ec1 100644
--- a/sys/arch/loongson/conf/files.loongson
+++ b/sys/arch/loongson/conf/files.loongson
@@ -1,4 +1,4 @@
-# $OpenBSD: files.loongson,v 1.25 2017/06/08 11:44:00 visa Exp $
+# $OpenBSD: files.loongson,v 1.26 2020/09/30 22:23:41 patrick Exp $
# Standard stanzas config(8) can't run without
maxpartitions 16
@@ -102,11 +102,6 @@ device stsec
attach stsec at i2c
file arch/loongson/dev/stsec.c stsec
-# Gdium M41T8x RTC
-device mfokclock
-attach mfokclock at i2c
-file arch/loongson/dev/m41t8xclock.c mfokclock
-
# SM502 OHCI
attach ohci at voyager with ohci_voyager
file arch/loongson/dev/ohci_voyager.c ohci_voyager