 @@ -1,14 +1,14 @@
-/*	$NetBSD: fdt_port.c,v 1.5 2019/12/15 14:18:16 jakllsch Exp $	*/
+/*	$NetBSD: fdt_port.c,v 1.6 2020/01/01 12:46:44 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -28,27 +28,27 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * ports and endpoints management. from
  * linux/Documentation/devicetree/bindings/graph.txt
  * Given a device and its node, it enumerates all ports and endpoints for this
  * device, and register connections with the remote endpoints.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: fdt_port.c,v 1.5 2019/12/15 14:18:16 jakllsch Exp $");
+__KERNEL_RCSID(1, "$NetBSD: fdt_port.c,v 1.6 2020/01/01 12:46:44 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/fdt/fdt_port.h>
 struct fdt_endpoint;
 struct fdt_port {
 @@ -180,45 +180,45 @@ fdt_endpoint_activate(struct fdt_endpoin
 	struct fdt_endpoint *rep = fdt_endpoint_remote(ep);
 	struct fdt_device_ports *rdp;
 	int error = 0;
 	if (rep == NULL)
 		return ENODEV;
 	KASSERT(ep->ep_active == rep->ep_active);
 	KASSERT(ep->ep_enabled == rep->ep_enabled);
 	if (!activate && ep->ep_enabled)
 		return EBUSY;
 	rdp = rep->ep_port->port_dp;
-	device_printf(rdp->dp_dev, "activating port %d endpoint %d\n",
+	aprint_debug_dev(rdp->dp_dev, "activating port %d endpoint %d\n",
 	    fdt_endpoint_port_index(rep), fdt_endpoint_index(rep));
 	if (rdp->dp_ep_activate)
 		error = rdp->dp_ep_activate(rdp->dp_dev, rep, activate);
 	if (error == 0)
 		rep->ep_active = ep->ep_active = activate;
 	return error;
+}
 int
 fdt_endpoint_activate_direct(struct fdt_endpoint *ep, bool activate)
+{
 	struct fdt_device_ports *dp;
 	int error = 0;
 	dp = ep->ep_port->port_dp;
-device_printf(dp->dp_dev, "activating port %d endpoint %d (direct)\n",
+	aprint_debug_dev(dp->dp_dev, "activating port %d endpoint %d (direct)\n",
-    fdt_endpoint_port_index(ep), fdt_endpoint_index(ep));
+	    fdt_endpoint_port_index(ep), fdt_endpoint_index(ep));
 	if (dp->dp_ep_activate)
 		error = dp->dp_ep_activate(dp->dp_dev, ep, activate);
 	return error;
+}
 int
 fdt_endpoint_enable(struct fdt_endpoint *ep, bool enable)
+{
 	struct fdt_endpoint *rep = fdt_endpoint_remote(ep);
 	struct fdt_device_ports *rdp;
 	int error = 0;
 @@ -362,28 +362,28 @@ fdt_endpoints_register(int phandle, stru
 		ep->ep_rphandle = fdtbus_get_phandle(child, "remote-endpoint");
 		ep->ep_rep = fdt_endpoint_get_from_phandle(
 		    port->port_ep[i].ep_rphandle);
 		rep = ep->ep_rep;
 		if (rep != NULL && rep->ep_rep != NULL) {
 			aprint_error("%s: ", ep_name(ep, buf, sizeof(buf)));
 			aprint_error("remote endpoint %s ",
 			    ep_name(rep, buf, sizeof(buf)));
 			aprint_error("already connected to %s\n",
 			    ep_name(rep->ep_rep, buf, sizeof(buf)));
 		} else if (rep != NULL) {
 			rep->ep_rep = ep;
 			rep->ep_rphandle = child;
-			aprint_verbose("%s ", ep_name(ep, buf, sizeof(buf)));
+			aprint_debug("%s ", ep_name(ep, buf, sizeof(buf)));
-			aprint_verbose("connected to %s\n",
+			aprint_debug("connected to %s\n",
 			    ep_name(rep, buf, sizeof(buf)));
 			if (rep->ep_type == EP_OTHER)
 				rep->ep_type = ep->ep_type;
 			else if (ep->ep_type == EP_OTHER)
 				ep->ep_type = rep->ep_type;
 			dp = port->port_dp;
 			if (dp->dp_ep_connect)
 				dp->dp_ep_connect(dp->dp_dev, ep, true);
 			dp = rep->ep_port->port_dp;
 			if (dp->dp_ep_connect)
 				dp->dp_ep_connect(dp->dp_dev, rep, true);
+		}
 		i++;