[src/trunk]: src/sys/dev/fdt Attach fdtbus to a /clocks node with no compatib...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d75e21d5058e
branches:  trunk
changeset: 354763:d75e21d5058e
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed Jun 28 23:45:20 2017 +0000

description:
Attach fdtbus to a /clocks node with no compatible string.

diffstat:

 sys/dev/fdt/fdtbus.c |  31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 deletions(-)

diffs (79 lines):

diff -r f4f061219813 -r d75e21d5058e sys/dev/fdt/fdtbus.c
--- a/sys/dev/fdt/fdtbus.c      Wed Jun 28 20:46:35 2017 +0000
+++ b/sys/dev/fdt/fdtbus.c      Wed Jun 28 23:45:20 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtbus.c,v 1.13 2017/05/28 00:28:17 jmcneill Exp $ */
+/* $NetBSD: fdtbus.c,v 1.14 2017/06/28 23:45:20 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.13 2017/05/28 00:28:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.14 2017/06/28 23:45:20 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,6 +40,8 @@
 
 #include <dev/fdt/fdtvar.h>
 
+#include <libfdt.h>
+
 #include "locators.h"
 
 #define        FDT_MAX_PATH    256
@@ -82,13 +84,21 @@
 fdt_match(device_t parent, cfdata_t cf, void *aux)
 {
        const struct fdt_attach_args *faa = aux;
+       const int phandle = faa->faa_phandle;
        int match;
 
-       match = of_match_compatible(faa->faa_phandle, fdtbus_compatible);
+       /* Check compatible string */
+       match = of_match_compatible(phandle, fdtbus_compatible);
        if (match)
                return match;
 
-       return OF_finddevice("/") == faa->faa_phandle;
+       /* Some /clocks nodes have no compatible string */
+       if (!of_hasprop(phandle, "compatible") &&
+           OF_finddevice("/clocks") == phandle)
+               return 1;
+
+       /* Always match the root node */
+       return OF_finddevice("/") == phandle;
 }
 
 static void
@@ -275,6 +285,7 @@
        const struct fdt_attach_args * const faa = aux;
        char buf[FDT_MAX_PATH];
        const char *name = buf;
+       int len;
 
        if (pnp && faa->faa_quiet)
                return QUIET;
@@ -286,9 +297,17 @@
        if (!fdtbus_get_path(faa->faa_phandle, buf, sizeof(buf)))
                name = faa->faa_name;
 
-       if (pnp)
+       if (pnp) {
                aprint_normal("%s at %s", name, pnp);
-       else
+               const char *compat = fdt_getprop(fdtbus_get_data(),
+                   fdtbus_phandle2offset(faa->faa_phandle), "compatible",
+                   &len);
+               while (len > 0) {
+                       aprint_debug(" <%s>", compat);
+                       len -= (strlen(compat) + 1);
+                       compat += (strlen(compat) + 1);
+               }
+       } else
                aprint_debug(" (%s)", name);
 
        return UNCONF;