diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2018-06-11 09:15:23 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2018-06-11 09:15:23 +0000 |
| commit | b99e02427e3551c0bae03fa5e4c4c92a3c470e94 (patch) | |
| tree | 407770616f7508bcf253c5ada8dbd2912cc0987a /sys | |
| parent | a30ae38487992539e1a661c33f94e9fa6fd6fdce (diff) | |
Also match on "fsl,imx6q-uart" such that this attaches on i.MX7.
ok patrick@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/fdt/imxuart.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/fdt/imxuart.c b/sys/dev/fdt/imxuart.c index 7bb1c1be3d1..6f3722affc9 100644 --- a/sys/dev/fdt/imxuart.c +++ b/sys/dev/fdt/imxuart.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imxuart.c,v 1.2 2018/05/31 09:12:59 kettenis Exp $ */ +/* $OpenBSD: imxuart.c,v 1.3 2018/06/11 09:15:22 kettenis Exp $ */ /* * Copyright (c) 2005 Dale Rahn <drahn@motorola.com> * @@ -135,8 +135,10 @@ imxuart_init_cons(void) struct fdt_reg reg; void *node; - if ((node = fdt_find_cons("fsl,imx21-uart")) == NULL) + if ((node = fdt_find_cons("fsl,imx21-uart")) == NULL && + (node = fdt_find_cons("fsl,imx6q-uart")) == NULL) return; + if (fdt_get_reg(node, 0, ®)) return; @@ -148,7 +150,8 @@ imxuart_match(struct device *parent, void *match, void *aux) { struct fdt_attach_args *faa = aux; - return OF_is_compatible(faa->fa_node, "fsl,imx21-uart"); + return (OF_is_compatible(faa->fa_node, "fsl,imx21-uart") || + OF_is_compatible(faa->fa_node, "fsl,imx6q-uart")); } void |