diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-06-19 14:38:14 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-06-19 14:38:14 +0000 |
| commit | 9c1294ee34bff437d6df6461c8d45f091897e804 (patch) | |
| tree | bb867e0a1c9080722e9941f5c8e9f1f90e93389a | |
| parent | 67fceb1ed80b1388f6181f05ce55e2889ab60e71 (diff) | |
omap4 uart is compatible with omap3 uart but has it's own compatible string
| -rw-r--r-- | sys/arch/armv7/omap/omap_com.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/armv7/omap/omap_com.c b/sys/arch/armv7/omap/omap_com.c index 05aafdc2dde..e750559898b 100644 --- a/sys/arch/armv7/omap/omap_com.c +++ b/sys/arch/armv7/omap/omap_com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omap_com.c,v 1.4 2016/06/19 14:27:35 jsg Exp $ */ +/* $OpenBSD: omap_com.c,v 1.5 2016/06/19 14:38:13 jsg Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. * All rights reserved. @@ -77,7 +77,8 @@ omapuart_init_cons(void) void *node; if ((node = fdt_find_cons("ti,omap3-uart")) == NULL) - return; + if ((node = fdt_find_cons("ti,omap4-uart")) == NULL) + return; if (fdt_get_memory_address(node, 0, &mem)) return; @@ -91,7 +92,8 @@ omapuart_match(struct device *parent, void *match, void *aux) { struct fdt_attach_args *faa = aux; - return OF_is_compatible(faa->fa_node, "ti,omap3-uart"); + return (OF_is_compatible(faa->fa_node, "ti,omap3-uart") || + OF_is_compatible(faa->fa_node, "ti,omap4-uart")); } void |