 @@ -1,14 +1,14 @@
-/* $NetBSD: fdt_clock.c,v 1.1 2015/12/22 21:42:11 jmcneill Exp $ */
+/* $NetBSD: fdt_clock.c,v 1.2 2018/06/10 13:26:29 jmcneill Exp $ */
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_clock.c,v 1.1 2015/12/22 21:42:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_clock.c,v 1.2 2018/06/10 13:26:29 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <libfdt.h>
 #include <dev/fdt/fdtvar.h>
 struct fdtbus_clock_controller {
 	device_t cc_dev;
 	int cc_phandle;
 	const struct fdtbus_clock_controller_func *cc_funcs;
 @@ -146,13 +146,47 @@ fdtbus_clock_get(int phandle, const char
 		if (strcmp(p, clkname) == 0) {
 			clk = fdtbus_clock_get_index(phandle, index);
 			break;
+		}
 		resid -= strlen(p);
 		p += strlen(p) + 1;
+	}
 	if (clock_names)
 		kmem_free(clock_names, len);
 	return clk;
+}
 /*
  * Search the DT for a clock by "clock-output-names" property.
+ *
  * This should only be used by clk backends. Not for use by ordinary
  * clock consumers!
  */
 struct clk *
 fdtbus_clock_byname(const char *clkname)
+{
 	struct fdtbus_clock_controller *cc;
 	u_int len, resid, index, clock_cells;
 	const char *p;
 	for (cc = fdtbus_cc; cc; cc = cc->cc_next) {
 		if (!of_hasprop(cc->cc_phandle, "clock-output-names"))
 			continue;
 		p = fdtbus_get_prop(cc->cc_phandle, "clock-output-names", &len);
 		for (index = 0, resid = len; resid > 0; index++) {
 			if (strcmp(p, clkname) == 0) {
 				if (of_getprop_uint32(cc->cc_phandle, "#clock-cells", &clock_cells))
 					break;
 				const u_int index_raw = htobe32(index);
 				return cc->cc_funcs->decode(cc->cc_dev,
 				    clock_cells > 0 ? &index_raw : NULL,
 				    clock_cells > 0 ? 4 : 0);
+			}
 			resid -= strlen(p) + 1;
 			p += strlen(p) + 1;
+		}
+	}
 	return NULL;
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: fdtvar.h,v 1.32 2018/05/15 10:17:55 jmcneill Exp $ */
+/* $NetBSD: fdtvar.h,v 1.33 2018/06/10 13:26:29 jmcneill Exp $ */
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -293,26 +293,27 @@ int		fdtbus_regulator_set_voltage(struct
 int		fdtbus_regulator_get_voltage(struct fdtbus_regulator *,
 		    u_int *);
 struct fdtbus_dma *fdtbus_dma_get(int, const char *, void (*)(void *), void *);
 struct fdtbus_dma *fdtbus_dma_get_index(int, u_int, void (*)(void *),
 		    void *);
 void		fdtbus_dma_put(struct fdtbus_dma *);
 int		fdtbus_dma_transfer(struct fdtbus_dma *,
 		    struct fdtbus_dma_req *);
 void		fdtbus_dma_halt(struct fdtbus_dma *);
 struct clk *	fdtbus_clock_get(int, const char *);
 struct clk *	fdtbus_clock_get_index(int, u_int);
 struct clk *	fdtbus_clock_byname(const char *);
 struct fdtbus_reset *fdtbus_reset_get(int, const char *);
 struct fdtbus_reset *fdtbus_reset_get_index(int, u_int);
 void		fdtbus_reset_put(struct fdtbus_reset *);
 int		fdtbus_reset_assert(struct fdtbus_reset *);
 int		fdtbus_reset_deassert(struct fdtbus_reset *);
 struct fdtbus_phy *fdtbus_phy_get(int, const char *);
 struct fdtbus_phy *fdtbus_phy_get_index(int, u_int);
 void		fdtbus_phy_put(struct fdtbus_phy *);
 int		fdtbus_phy_enable(struct fdtbus_phy *, bool);
 struct fdtbus_mmc_pwrseq *fdtbus_mmc_pwrseq_get(int);