summaryrefslogtreecommitdiffstats
path: root/sys/dev/fdt/fdt_common.c
diff options
context:
space:
mode:
authorzbb <zbb@FreeBSD.org>2016-01-20 13:35:06 +0000
committerzbb <zbb@FreeBSD.org>2016-01-20 13:35:06 +0000
commitf1ec2b599b9351d9390d524371343e434e8f660f (patch)
treea8543b5f4d48ee3a6d65380bd3580047b27ca3e6 /sys/dev/fdt/fdt_common.c
parent6af435aa28cff0f46d612305cce25f4f7503cde4 (diff)
downloadFreeBSD-src-f1ec2b599b9351d9390d524371343e434e8f660f.zip
FreeBSD-src-f1ec2b599b9351d9390d524371343e434e8f660f.tar.gz
Do not require strict compatibility on simplebus
Strict compatibility requirement is a root of problems when simplebus' node has two compatibility strings (i.e. on Armada38x). Removing this requirement should not interfere with other platforms. fdt_is_compatible_strict() and fdt_find_compatible() calls were changed in fdt_common.c and mv_common.c. Reviewed by: ian, imp Obtained from: Semihalf Sponsored by: Stormshield Submitted by: Bartosz Szczepanek <bsz@semihalf.com> Differential revision: https://reviews.freebsd.org/D4602
Diffstat (limited to 'sys/dev/fdt/fdt_common.c')
-rw-r--r--sys/dev/fdt/fdt_common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/fdt/fdt_common.c b/sys/dev/fdt/fdt_common.c
index f00519e..c7d3397 100644
--- a/sys/dev/fdt/fdt_common.c
+++ b/sys/dev/fdt/fdt_common.c
@@ -212,7 +212,7 @@ fdt_immr_addr(vm_offset_t immr_va)
* Try to access the SOC node directly i.e. through /aliases/.
*/
if ((node = OF_finddevice("soc")) != 0)
- if (fdt_is_compatible_strict(node, "simple-bus"))
+ if (fdt_is_compatible(node, "simple-bus"))
goto moveon;
/*
* Find the node the long way.
@@ -220,7 +220,7 @@ fdt_immr_addr(vm_offset_t immr_va)
if ((node = OF_finddevice("/")) == 0)
return (ENXIO);
- if ((node = fdt_find_compatible(node, "simple-bus", 1)) == 0)
+ if ((node = fdt_find_compatible(node, "simple-bus", 0)) == 0)
return (ENXIO);
moveon:
OpenPOWER on IntegriCloud