 @@ -1,14 +1,14 @@
-/*	$NetBSD: cuda.c,v 1.21 2016/02/14 19:54:20 chs Exp $ */
+/*	$NetBSD: cuda.c,v 1.22 2017/09/22 04:00:58 macallan Exp $ */
 /*-
  * Copyright (c) 2006 Michael Lorenz
  * 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 @@
  * ``AS IS'' AND ANY EXPRESS OR 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 FOUNDATION OR CONTRIBUTORS
  * 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: cuda.c,v 1.21 2016/02/14 19:54:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.22 2017/09/22 04:00:58 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/pio.h>
 #include <dev/clock_subr.h>
 #include <dev/i2c/i2cvar.h>
 @@ -165,26 +165,29 @@ cuda_match(device_t parent, struct cfdat
 		return 10;	/* beat adb* at obio? */
+	}
 	return 0;
+}
 static void
 cuda_attach(device_t parent, device_t self, void *aux)
+{
 	struct confargs *ca = aux;
 	struct cuda_softc *sc = device_private(self);
 	struct i2cbus_attach_args iba;
 	static struct cuda_attach_args caa;
 	prop_dictionary_t dict = device_properties(self);
 	prop_dictionary_t dev;
 	prop_array_t cfg;
 	int irq = ca->ca_intr[0];
 	int node, i, child;
 	char name[32];
 	sc->sc_dev = self;
 	node = of_getnode_byname(OF_parent(ca->ca_node), "extint-gpio1");
 	if (node)
 		OF_getprop(node, "interrupts", &irq, 4);
 	aprint_normal(" irq %d", irq);
 	sc->sc_node = ca->ca_node;
 	sc->sc_memt = ca->ca_tag;
 @@ -240,26 +243,50 @@ cuda_attach(device_t parent, device_t se
 			sc->sc_todr.cookie = sc;
 			todr_attach(&sc->sc_todr);
+		}
 		child = OF_peer(child);
+	}
 	caa.cookie = sc;
 	caa.set_handler = cuda_set_handler;
 	caa.send = cuda_send;
 	caa.poll = cuda_poll;
 #if notyet
 	config_found(self, &caa, cuda_print);
 #endif
 	cfg = prop_array_create();
 	prop_dictionary_set(dict, "i2c-child-devices", cfg);
 	prop_object_release(cfg);
 	/* we don't have OF nodes for i2c devices so we have to make our own */
 	node = OF_finddevice("/valkyrie");
 	if (node != -1) {
 		dev = prop_dictionary_create();
 		prop_dictionary_set_cstring(dev, "name", "videopll");
 		prop_dictionary_set_uint32(dev, "addr", 0x50);
 		prop_array_add(cfg, dev);
 		prop_object_release(dev);
+	}
 	node = OF_finddevice("/perch");
 	if (node != -1) {
 		dev = prop_dictionary_create();
 		prop_dictionary_set_cstring(dev, "name", "sgsmix");
 		prop_dictionary_set_uint32(dev, "addr", 0x8a);
 		prop_array_add(cfg, dev);
 		prop_object_release(dev);
+	}
 	mutex_init(&sc->sc_buslock, MUTEX_DEFAULT, IPL_NONE);
 	memset(&iba, 0, sizeof(iba));
 	iba.iba_tag = &sc->sc_i2c;
 	sc->sc_i2c.ic_cookie = sc;
 	sc->sc_i2c.ic_acquire_bus = cuda_i2c_acquire_bus;
 	sc->sc_i2c.ic_release_bus = cuda_i2c_release_bus;
 	sc->sc_i2c.ic_send_start = NULL;
 	sc->sc_i2c.ic_send_stop = NULL;
 	sc->sc_i2c.ic_initiate_xfer = NULL;
 	sc->sc_i2c.ic_read_byte = NULL;
 	sc->sc_i2c.ic_write_byte = NULL;
 	sc->sc_i2c.ic_exec = cuda_i2c_exec;
 	config_found_ia(self, "i2cbus", &iba, iicbus_print);