[src/netbsd-9]: src/sys/dev/fdt Pull up following revision(s) (requested by j...

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

details:   https://anonhg.NetBSD.org/src/rev/846e32b7e380
branches:  netbsd-9
changeset: 454796:846e32b7e380
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Sep 28 07:22:16 2019 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #256):

        sys/dev/fdt/fdt_pinctrl.c: revision 1.9

Don't assume pinctrl-0 is the default configuration.

diffstat:

 sys/dev/fdt/fdt_pinctrl.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r 28014e98e4e6 -r 846e32b7e380 sys/dev/fdt/fdt_pinctrl.c
--- a/sys/dev/fdt/fdt_pinctrl.c Fri Sep 27 15:31:38 2019 +0000
+++ b/sys/dev/fdt/fdt_pinctrl.c Sat Sep 28 07:22:16 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_pinctrl.c,v 1.8 2019/02/27 16:56:00 jakllsch Exp $ */
+/* $NetBSD: fdt_pinctrl.c,v 1.8.4.1 2019/09/28 07:22:16 martin Exp $ */
 
 /*-
  * Copyright (c) 2019 Jason R. Thorpe
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_pinctrl.c,v 1.8 2019/02/27 16:56:00 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_pinctrl.c,v 1.8.4.1 2019/09/28 07:22:16 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -142,16 +142,16 @@
                fdtbus_pinctrl_configure_node(child);
 
                /*
-                * Set configuration 0 for this node. This may fail if the
+                * Set default configuration for this node. This may fail if the
                 * pinctrl provider is missing; that's OK, we will re-configure
                 * when that provider attaches.
                 */
                fdtbus_get_path(child, buf, sizeof(buf));
-               error = fdtbus_pinctrl_set_config_index(child, 0);
+               error = fdtbus_pinctrl_set_config(child, "default");
                if (error == 0)
-                       aprint_debug("pinctrl: set config pinctrl-0 for %s\n", buf);
+                       aprint_debug("pinctrl: set default config for %s\n", buf);
                else if (error != ENOENT)
-                       aprint_debug("pinctrl: failed to set config pinctrl-0 for %s: %d\n", buf, error);
+                       aprint_debug("pinctrl: failed to set default config for %s: %d\n", buf, error);
        }
 }