diff options
| author |   kettenis <kettenis@openbsd.org> | 2020-04-27 12:41:44 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2020-04-27 12:41:44 +0000 |
| commit | df3004fceb7899ceec73ee23bc65bccfdcd00833 (patch) | |
| tree | 0a200bfc4e64adfbff3e0662c95d8b01ea40d25e | |
| parent | Don't clear OSF flag when we attach such that we can reject the RTC clock (diff) | |
| download | wireguard-openbsd-df3004fceb7899ceec73ee23bc65bccfdcd00833.tar.xz wireguard-openbsd-df3004fceb7899ceec73ee23bc65bccfdcd00833.zip | |
Attach when the name matches "dallas,ds1307" which is what the device tree
binding uses. Remove warning about overwriting todr_handle since that is
normal behaviour on arm64 systems.
ok sthen@
| -rw-r--r-- | sys/dev/i2c/ds1307.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/dev/i2c/ds1307.c b/sys/dev/i2c/ds1307.c index e5cbf1c9d4e..be831d62a18 100644 --- a/sys/dev/i2c/ds1307.c +++ b/sys/dev/i2c/ds1307.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ds1307.c,v 1.1 2016/06/20 13:42:42 mglocker Exp $ */ +/* $OpenBSD: ds1307.c,v 1.2 2020/04/27 12:41:44 kettenis Exp $ */ /* * Copyright (c) 2016 Marcus Glocker <mglocker@openbsd.org> @@ -96,7 +96,8 @@ maxrtc_match(struct device *parent, void *v, void *arg) { struct i2c_attach_args *ia = arg; - if (strcmp(ia->ia_name, "ds1307") == 0) + if (strcmp(ia->ia_name, "dallas,ds1307") == 0 || + strcmp(ia->ia_name, "ds1307") == 0) return (1); return (0); @@ -123,12 +124,6 @@ maxrtc_attach(struct device *parent, struct device *self, void *arg) if (maxrtc_set_24h_mode(sc) == -1) return; - /* register our time handlers */ - if (todr_handle != NULL) { - printf("%s: overwriting existing rtc handler\n", - sc->sc_dev.dv_xname); - } - /* XXX just overwrite existing rtc handler? */ todr_handle = &sc->sc_todr; } |