diff options
| author |   jsg <jsg@openbsd.org> | 2019-01-21 11:24:05 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2019-01-21 11:24:05 +0000 |
| commit | 24b9e7d05adfaf9ea70423a91cd309d6d269d5d9 (patch) | |
| tree | 83eed6050a8dea24721d7b473f59501310e454b5 | |
| parent | forgot to cvs add this file in previous series of commits; grrr (diff) | |
| download | wireguard-openbsd-24b9e7d05adfaf9ea70423a91cd309d6d269d5d9.tar.xz wireguard-openbsd-24b9e7d05adfaf9ea70423a91cd309d6d269d5d9.zip | |
Adapt to allwinner device tree changes in linux >= 5.0-rc1
"allwinner,sun6i-a31-rtc" has been removed from h3/h5/r40/a64
ok kettenis@
| -rw-r--r-- | sys/dev/fdt/sxirtc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/fdt/sxirtc.c b/sys/dev/fdt/sxirtc.c index 1bc5a689372..68ca73590c9 100644 --- a/sys/dev/fdt/sxirtc.c +++ b/sys/dev/fdt/sxirtc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sxirtc.c,v 1.2 2017/03/27 14:03:19 kettenis Exp $ */ +/* $OpenBSD: sxirtc.c,v 1.3 2019/01/21 11:24:05 jsg Exp $ */ /* * Copyright (c) 2008 Mark Kettenis * Copyright (c) 2013 Artturi Alm @@ -76,7 +76,9 @@ sxirtc_match(struct device *parent, void *match, void *aux) return (OF_is_compatible(faa->fa_node, "allwinner,sun4i-a10-rtc") || OF_is_compatible(faa->fa_node, "allwinner,sun7i-a20-rtc") || - OF_is_compatible(faa->fa_node, "allwinner,sun6i-a31-rtc")); + OF_is_compatible(faa->fa_node, "allwinner,sun6i-a31-rtc") || + OF_is_compatible(faa->fa_node, "allwinner,sun8i-h3-rtc") || + OF_is_compatible(faa->fa_node, "allwinner,sun50i-h5-rtc")); } void @@ -98,7 +100,9 @@ sxirtc_attach(struct device *parent, struct device *self, void *aux) faa->fa_reg[0].size, 0, &sc->sc_ioh)) panic("sxirtc_attach: bus_space_map failed!"); - if (OF_is_compatible(faa->fa_node, "allwinner,sun6i-a31-rtc")) { + if (OF_is_compatible(faa->fa_node, "allwinner,sun6i-a31-rtc") || + OF_is_compatible(faa->fa_node, "allwinner,sun8i-h3-rtc") || + OF_is_compatible(faa->fa_node, "allwinner,sun50i-h5-rtc")) { sc->sc_yymmdd = SXIRTC_YYMMDD_A31; sc->sc_hhmmss = SXIRTC_HHMMSS_A31; } else { |