summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2017-09-20 11:21:59 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2017-09-20 11:21:59 +0000
commitaf065357eb0d7053b7ca5fe440d5de7245af674c (patch)
tree4766a5c27aaee24ebccd639f68afdcc68b00d912
parent1f28d26f8dbbb7c959dd2dfc29489abd9587eb2f (diff)
Raise match priority such that imxocotp(4) wins over syscon(4).
ok patrick@
-rw-r--r--sys/arch/armv7/imx/imxocotp.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/arch/armv7/imx/imxocotp.c b/sys/arch/armv7/imx/imxocotp.c
index b6d146f2cd8..38310b9a857 100644
--- a/sys/arch/armv7/imx/imxocotp.c
+++ b/sys/arch/armv7/imx/imxocotp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxocotp.c,v 1.4 2016/09/23 17:59:17 kettenis Exp $ */
+/* $OpenBSD: imxocotp.c,v 1.5 2017/09/20 11:21:58 kettenis Exp $ */
/*
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
*
@@ -64,7 +64,10 @@ imxocotp_match(struct device *parent, void *match, void *aux)
{
struct fdt_attach_args *faa = aux;
- return OF_is_compatible(faa->fa_node, "fsl,imx6q-ocotp");
+ if (OF_is_compatible(faa->fa_node, "fsl,imx6q-ocotp"))
+ return 10; /* Must beat syscon(4). */
+
+ return 0;
}
void