diff options
| author |   kettenis <kettenis@openbsd.org> | 2017-08-13 00:13:07 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2017-08-13 00:13:07 +0000 |
| commit | b2bb2ded4e59e7db57ec068ab0648d1558ca2097 (patch) | |
| tree | 2ee52216abada63760b838d7c39760c3f3f8cc0a | |
| parent | Rewrite the TLS status request extension to use the new TLS extension framework. (diff) | |
| download | wireguard-openbsd-b2bb2ded4e59e7db57ec068ab0648d1558ca2097.tar.xz wireguard-openbsd-b2bb2ded4e59e7db57ec068ab0648d1558ca2097.zip | |
Add support for Allwinner A64/H5 device trees that use the official Linux
bindings. The current U-Boot device trees are somewhat broken and keep
the SD-card controller from working.
| -rw-r--r-- | sys/dev/fdt/sximmc.c | 17 | ||||
| -rw-r--r-- | sys/dev/fdt/sxipio.c | 8 |
2 files changed, 12 insertions, 13 deletions
diff --git a/sys/dev/fdt/sximmc.c b/sys/dev/fdt/sximmc.c index 008ea70d2b9..7acb8f55d56 100644 --- a/sys/dev/fdt/sximmc.c +++ b/sys/dev/fdt/sximmc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sximmc.c,v 1.2 2017/06/22 02:44:37 deraadt Exp $ */ +/* $OpenBSD: sximmc.c,v 1.3 2017/08/13 00:13:07 kettenis Exp $ */ /* $NetBSD: awin_mmc.c,v 1.23 2015/11/14 10:32:40 bouyer Exp $ */ /*- @@ -289,16 +289,11 @@ sximmc_match(struct device *parent, void *match, void *aux) { struct fdt_attach_args *faa = aux; - if (OF_is_compatible(faa->fa_node, "allwinner,sun4i-a10-mmc")) - return 1; - if (OF_is_compatible(faa->fa_node, "allwinner,sun5i-a13-mmc")) - return 1; - if (OF_is_compatible(faa->fa_node, "allwinner,sun7i-a20-mmc")) - return 1; - if (OF_is_compatible(faa->fa_node, "allwinner,sun9i-a80-mmc")) - return 1; - - return 0; + return (OF_is_compatible(faa->fa_node, "allwinner,sun4i-a10-mmc") || + OF_is_compatible(faa->fa_node, "allwinner,sun5i-a13-mmc") || + OF_is_compatible(faa->fa_node, "allwinner,sun7i-a20-mmc") || + OF_is_compatible(faa->fa_node, "allwinner,sun9i-a80-mmc") || + OF_is_compatible(faa->fa_node, "allwinner,sun50i-a64-mmc")); } int diff --git a/sys/dev/fdt/sxipio.c b/sys/dev/fdt/sxipio.c index dc4de082a6d..643226ecd19 100644 --- a/sys/dev/fdt/sxipio.c +++ b/sys/dev/fdt/sxipio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sxipio.c,v 1.2 2017/05/02 14:38:36 kettenis Exp $ */ +/* $OpenBSD: sxipio.c,v 1.3 2017/08/13 00:13:07 kettenis Exp $ */ /* * Copyright (c) 2010 Miodrag Vallat. * Copyright (c) 2013 Artturi Alm @@ -151,7 +151,11 @@ struct sxipio_pins sxipio_pins[] = { { "allwinner,sun50i-a64-pinctrl", sun50i_a64_pins, nitems(sun50i_a64_pins) - } + }, + { + "allwinner,sun50i-h5-pinctrl", + sun8i_h3_pins, nitems(sun8i_h3_pins) + }, }; int |