 @@ -1,14 +1,14 @@
-/*	$NetBSD: at24cxx.c,v 1.29 2018/06/26 06:21:23 thorpej Exp $	*/
+/*	$NetBSD: at24cxx.c,v 1.30 2018/06/26 06:34:55 thorpej Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Steve C. Woodford and Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -26,27 +26,27 @@
  * 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 WASABI SYSTEMS, INC
  * 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: at24cxx.c,v 1.29 2018/06/26 06:21:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at24cxx.c,v 1.30 2018/06/26 06:34:55 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/uio.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/event.h>
 #include <sys/bus.h>
 @@ -159,28 +159,26 @@ seeprom_attach(device_t parent, device_t
 	 * AT24C04/08/16 decode fewer of the i2c address bits,
 	 * using the bottom 1, 2, or 3 to select the 256-byte
 	 * super-page.
+	 *
 	 * The AT24C32/64/128/256/512 EEPROMs use a 2 byte command
 	 * word and decode all of the i2c address bits.
+	 *
 	 * The AT24C1024 EEPROMs use a 2 byte command and also do bank
 	 * switching to select the proper super-page.  This isn't
 	 * supported by this driver.
 	 */
 	if (device_cfdata(self)->cf_flags)
 		sc->sc_size = (device_cfdata(self)->cf_flags << 7);
 	else
 		sc->sc_size = ia->ia_size;
 	if (sc->sc_size <= 0 && ia->ia_ncompat > 0) {
 		if (iic_compatible_match(ia, compat_data, &dce))
 			sc->sc_size = dce->data;
+	}
 	switch (sc->sc_size) {
 	case 128:		/* 1Kbit */
 	case 256:		/* 2Kbit */
 	case 512:		/* 4Kbit */
 	case 1024:		/* 8Kbit */
 	case 2048:		/* 16Kbit */
 		sc->sc_cmdlen = 1;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i2c.c,v 1.65 2018/06/26 04:32:35 thorpej Exp $	*/
+/*	$NetBSD: i2c.c,v 1.66 2018/06/26 06:34:55 thorpej Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -30,27 +30,27 @@
  * 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.
  */
 #ifdef _KERNEL_OPT
 #include "opt_i2c.h"
 #endif
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.65 2018/06/26 04:32:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.66 2018/06/26 06:34:55 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/event.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/kthread.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/module.h>
 @@ -275,27 +275,26 @@ iic_search(device_t parent, cfdata_t cf,
 	} else if (prop_string_equals_cstring(pstr,
 					I2C_PROBE_STRATEGY_NONE)) {
 		probe_func = iic_probe_none;
 	} else {
 		aprint_error_dev(sc->sc_dev,
 			"unknown probe strategy '%s'; defaulting to '%s'\n",
 			prop_string_cstring_nocopy(pstr),
 			I2C_PROBE_STRATEGY_QUICK_WRITE);
 		/* Use the default. */
+	}
 	ia.ia_tag = sc->sc_tag;
 	ia.ia_size = cf->cf_loc[IICCF_SIZE];
 	ia.ia_type = sc->sc_type;
 	ia.ia_name = NULL;
 	ia.ia_ncompat = 0;
 	ia.ia_compat = NULL;
 	ia.ia_prop = NULL;
 	if (cf->cf_loc[IICCF_ADDR] == IICCF_ADDR_DEFAULT) {
 		/*
 		 * This particular config directive has
 		 * wildcarded the address, so we will
 		 * scan the entire bus for it.
 		 */
 @@ -431,59 +430,54 @@ iic_attach(device_t parent, device_t sel
 		indirect_config = false;
 	} else {
 		props = device_properties(parent);
 		if (!prop_dictionary_get_bool(props, "i2c-indirect-config",
 		    &indirect_config))
 			indirect_config = true;
 		child_devices = prop_dictionary_get(props, "i2c-child-devices");
+	}
 	if (child_devices) {
 		unsigned int i, count;
 		prop_dictionary_t dev;
 		prop_data_t cdata;
-		uint32_t addr, size;
+		uint32_t addr;
 		uint64_t cookie;
 		const char *name;
 		struct i2c_attach_args ia;
 		int loc[IICCF_NLOCS];
 		memset(loc, 0, sizeof loc);
 		count = prop_array_count(child_devices);
 		for (i = 0; i < count; i++) {
 			dev = prop_array_get(child_devices, i);
 			if (!dev) continue;
  			if (!prop_dictionary_get_cstring_nocopy(
 			    dev, "name", &name)) {
 				/* "name" property is optional. */
 				name = NULL;
+			}
 			if (!prop_dictionary_get_uint32(dev, "addr", &addr))
 				continue;
 			if (!prop_dictionary_get_uint64(dev, "cookie", &cookie))
 				cookie = 0;
 			loc[IICCF_ADDR] = addr;
 			if (prop_dictionary_get_uint32(dev, "size", &size))
 				loc[IICCF_SIZE] = size;
 			else
 				size = loc[IICCF_SIZE] = IICCF_SIZE_DEFAULT;
 			memset(&ia, 0, sizeof ia);
 			ia.ia_addr = addr;
 			ia.ia_type = sc->sc_type;
 			ia.ia_tag = ic;
 			ia.ia_name = name;
 			ia.ia_cookie = cookie;
 			ia.ia_size = size;
 			ia.ia_prop = dev;
 			buf = NULL;
 			cdata = prop_dictionary_get(dev, "compatible");
 			if (cdata)
 				iic_fill_compat(&ia,
 				    prop_data_data_nocopy(cdata),
 				    prop_data_size(cdata), &buf);
 			if (name == NULL && cdata == NULL) {
 				aprint_error_dev(self,
 				    "WARNING: ignoring bad child device entry "
 				    "for address 0x%02x\n", addr);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i2cvar.h,v 1.16 2018/06/26 04:32:35 thorpej Exp $	*/
+/*	$NetBSD: i2cvar.h,v 1.17 2018/06/26 06:34:55 thorpej Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Steve C. Woodford and Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -123,27 +123,26 @@ typedef struct i2c_controller {
 #define	I2C_TYPE_SMBUS	1
 /* Used to attach the i2c framework to the controller. */
 struct i2cbus_attach_args {
 	i2c_tag_t iba_tag;		/* the controller */
 	int iba_type;			/* bus type */
 	prop_array_t iba_child_devices;	/* child devices (direct config) */
 };
 /* Used to attach devices on the i2c bus. */
 struct i2c_attach_args {
 	i2c_tag_t	ia_tag;		/* our controller */
 	i2c_addr_t	ia_addr;	/* address of device */
 	int		ia_size;	/* size (for EEPROMs) */
 	int		ia_type;	/* bus type */
 	/* only set if using direct config */
 	const char *	ia_name;	/* name of the device */
 	int		ia_ncompat;	/* number of pointers in the
 					   ia_compat array */
 	const char **	ia_compat;	/* chip names */
 	prop_dictionary_t ia_prop;	/* dictionnary for this device */
 	/*
 	 * The following is of limited usefulness and should only be used
 	 * in rare cases where we really know what we are doing. Example:
 	 * a machine dependent i2c driver (located in sys/arch/$arch/dev)
 	 * needing to access some firmware properties.
 	 * Depending on the firmware in use, an identifier for the device

 @@ -1,20 +1,20 @@
-#	$NetBSD: files.i2c,v 1.92 2018/05/27 05:31:20 thorpej Exp $
+#	$NetBSD: files.i2c,v 1.93 2018/06/26 06:34:55 thorpej Exp $
 obsolete defflag	opt_i2cbus.h		I2C_SCAN
 define	i2cbus { }
 define	i2cexec
-device	iic { [addr = -1], [size = -1] } : i2c_bitbang
+device	iic { [addr = -1] } : i2c_bitbang
 attach	iic at i2cbus
 file	dev/i2c/i2c.c				iic
 file	dev/i2c/i2c_exec.c			iic | i2cbus | i2cexec
 file	dev/i2c/i2c_subr.c			i2cbus
 defparam opt_i2c.h				I2C_MAX_ADDR
 # Common module for bit-bang'ing an I2C bus
 define	i2c_bitbang
 file	dev/i2c/i2c_bitbang.c			i2c_bitbang
 # Auvitek AU8522 decoder
 define	au8522: i2cexec
 file	dev/i2c/au8522.c			au8522