[src/trunk]: src/sys/dev/fdt Unbreak previous; we have to look for a child no...

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

details:   https://anonhg.NetBSD.org/src/rev/7cee42c6f5c7
branches:  trunk
changeset: 983361:7cee42c6f5c7
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue May 18 11:13:31 2021 +0000

description:
Unbreak previous; we have to look for a child node iff our node isn't
compatible with snps,dwc3.

diffstat:

 sys/dev/fdt/dwc3_fdt.c |  30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diffs (66 lines):

diff -r ce5080c80952 -r 7cee42c6f5c7 sys/dev/fdt/dwc3_fdt.c
--- a/sys/dev/fdt/dwc3_fdt.c    Tue May 18 11:02:58 2021 +0000
+++ b/sys/dev/fdt/dwc3_fdt.c    Tue May 18 11:13:31 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc3_fdt.c,v 1.14 2021/04/24 23:36:53 thorpej Exp $ */
+/* $NetBSD: dwc3_fdt.c,v 1.15 2021/05/18 11:13:31 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc3_fdt.c,v 1.14 2021/04/24 23:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc3_fdt.c,v 1.15 2021/05/18 11:13:31 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -203,14 +203,18 @@
 }
 
 static const struct device_compatible_entry compat_data[] = {
-                                               /* 1 = parent of dwc3 subnode */
-       { .compat = "allwinner,sun50i-h6-dwc3",         .value = 1 },
-       { .compat = "amlogic,meson-gxl-dwc3",           .value = 1 },
-       { .compat = "fsl,imx8mq-dwc3",                  .value = 1 },
-       { .compat = "rockchip,rk3328-dwc3",             .value = 1 },
-       { .compat = "rockchip,rk3399-dwc3",             .value = 1 },
-       { .compat = "samsung,exynos5250-dwusb3",        .value = 1 },
-       { .compat = "snps,dwc3",                        .value = 0 },
+       { .compat = "allwinner,sun50i-h6-dwc3" },
+       { .compat = "amlogic,meson-gxl-dwc3" },
+       { .compat = "fsl,imx8mq-dwc3" },
+       { .compat = "rockchip,rk3328-dwc3" },
+       { .compat = "rockchip,rk3399-dwc3" },
+       { .compat = "samsung,exynos5250-dwusb3" },
+       { .compat = "snps,dwc3" },
+       DEVICE_COMPAT_EOL
+};
+
+static const struct device_compatible_entry compat_data_dwc3[] = {
+       { .compat = "snps,dwc3" },
        DEVICE_COMPAT_EOL
 };
 
@@ -228,7 +232,6 @@
        struct xhci_softc * const sc = device_private(self);
        struct fdt_attach_args * const faa = aux;
        const int phandle = faa->faa_phandle;
-       const struct device_compatible_entry *dce;
        struct fdtbus_reset *rst;
        struct fdtbus_phy *phy;
        struct clk *clk;
@@ -239,11 +242,8 @@
        void *ih;
        u_int n;
 
-       dce = of_compatible_lookup(phandle, compat_data);
-       KASSERT(dce != NULL);
-
        /* Find dwc3 sub-node */
-       if (dce->value != 0) {
+       if (of_compatible_lookup(phandle, compat_data_dwc3) == NULL) {
                dwc3_phandle = of_find_firstchild_byname(phandle, "dwc3");
        } else {
                dwc3_phandle = phandle;