 @@ -1,14 +1,14 @@
-/* $NetBSD: motoi2c.c,v 1.8 2020/12/23 16:02:11 thorpej Exp $ */
+/* $NetBSD: motoi2c.c,v 1.9 2021/01/24 18:01:13 jmcneill Exp $ */
 /*-
  * Copyright (c) 2007, 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas.
+ *
  * 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.
 @@ -20,27 +20,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: motoi2c.c,v 1.8 2020/12/23 16:02:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motoi2c.c,v 1.9 2021/01/24 18:01:13 jmcneill Exp $");
 #if defined(__arm__) || defined(__aarch64__)
 #include "opt_fdt.h"
 #endif
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/mutex.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 #include <dev/i2c/i2cvar.h>
 @@ -97,41 +97,42 @@ motoi2c_attach_common(device_t self, str
 		i2c = &motoi2c_default_settings;
 	iic_tag_init(&sc->sc_i2c);
 	sc->sc_i2c.ic_cookie = sc;
 	sc->sc_i2c.ic_acquire_bus = motoi2c_acquire_bus;
 	sc->sc_i2c.ic_release_bus = motoi2c_release_bus;
 	sc->sc_i2c.ic_exec = motoi2c_exec;
 	if (sc->sc_iord == NULL)
 		sc->sc_iord = motoi2c_iord1;
 	if (sc->sc_iowr == NULL)
 		sc->sc_iowr = motoi2c_iowr1;
 	memset(&iba, 0, sizeof(iba));
 	iba.iba_tag = &sc->sc_i2c;
 	iba.iba_child_devices = sc->sc_child_devices;
 	I2C_WRITE(I2CCR, 0);		/* reset before changing anything */
 	I2C_WRITE(I2CDFSRR, i2c->i2c_dfsrr);	/* sampling units */
 	I2C_WRITE(I2CFDR, i2c->i2c_fdr);	/* divider 3072 (0x31) */
 	I2C_WRITE(I2CADR, i2c->i2c_adr);	/* our slave address is 0x7f */
 	I2C_WRITE(I2CSR, 0);		/* clear status flags */
 #ifdef FDT
-	KASSERT(sc->sc_phandle != 0);
+	if (sc->sc_phandle != 0) {
-	fdtbus_register_i2c_controller(&sc->sc_i2c, sc->sc_phandle);
+		fdtbus_register_i2c_controller(&sc->sc_i2c, sc->sc_phandle);
 		fdtbus_attach_i2cbus(self, sc->sc_phandle, &sc->sc_i2c,
-	fdtbus_attach_i2cbus(self, sc->sc_phandle, &sc->sc_i2c, iicbus_print);
+		    iicbus_print);
-#else
+	} else
 	config_found_ia(self, "i2cbus", &iba, iicbus_print);
 #endif
 	config_found_ia(self, "i2cbus", &iba, iicbus_print);
+}
 static int
 motoi2c_acquire_bus(void *v, int flags)
+{
 	struct motoi2c_softc * const sc = v;
 	I2C_WRITE(I2CCR, CR_MEN);	/* enable the I2C module */
 	return 0;
+}
 static void

 @@ -1,14 +1,14 @@
-/* $NetBSD: motoi2cvar.h,v 1.6 2019/12/22 23:23:32 thorpej Exp $ */
+/* $NetBSD: motoi2cvar.h,v 1.7 2021/01/24 18:01:13 jmcneill Exp $ */
 /*-
  * Copyright (c) 2007, 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas.
+ *
  * 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.
 @@ -41,26 +41,27 @@ typedef void (*motoi2c_iowr_t)(struct mo
 struct motoi2c_settings {
 	uint8_t			i2c_adr;
 	uint8_t			i2c_fdr;
 	uint8_t			i2c_dfsrr;
 };
 struct motoi2c_softc {
 	bus_space_tag_t		sc_iot;
 	bus_space_handle_t	sc_ioh;
 	struct i2c_controller	sc_i2c;
 	motoi2c_iord_t		sc_iord;
 	motoi2c_iowr_t		sc_iowr;
 	int			sc_phandle;
 	prop_array_t		sc_child_devices;
 };
 #define	MOTOI2C_ADR_DEFAULT	(0x7e << 1)
 #define	MOTOI2C_FDR_DEFAULT	0x31	/* 3072 */
 #define	MOTOI2C_DFSRR_DEFAULT	0x10
 #ifdef _KERNEL
 void	motoi2c_attach_common(device_t, struct motoi2c_softc *,
 	    const struct motoi2c_settings *);
 int	motoi2c_intr(void *);
 #endif
 #endif /* !_DEV_I2C_MOTOI2CVAR_H_ */