 @@ -1,14 +1,14 @@
-/* $NetBSD: sunxi_twi.c,v 1.10 2018/07/01 21:16:19 jmcneill Exp $ */
+/* $NetBSD: sunxi_twi.c,v 1.11 2020/01/12 17:48:42 thorpej Exp $ */
 /*-
  * Copyright (c) 2017 Jared 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.
 @@ -16,68 +16,55 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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 "opt_gttwsi.h"
 #ifdef GTTWSI_ALLWINNER
 # error Do not define GTTWSI_ALLWINNER when using this driver
 #endif
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_twi.c,v 1.10 2018/07/01 21:16:19 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_twi.c,v 1.11 2020/01/12 17:48:42 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/i2c/gttwsivar.h>
 #include <dev/i2c/gttwsireg.h>
 #include <dev/fdt/fdtvar.h>
 #define	TWI_CCR_REG	0x14
 #define	 TWI_CCR_CLK_M	__BITS(6,3)
 #define	 TWI_CCR_CLK_N	__BITS(2,0)
-static uint8_t sunxi_twi_regmap_rd[] = {
+static const bus_size_t sunxi_twi_regmap[] = {
-	[TWSI_SLAVEADDR/4]		= 0x00,
+	[TWSI_SLAVEADDR]	= TWSI_ALLWINNER_SLAVEADDR,
-	[TWSI_EXTEND_SLAVEADDR/4]	= 0x04,
+	[TWSI_EXTEND_SLAVEADDR]	= TWSI_ALLWINNER_EXTEND_SLAVEADDR,
-	[TWSI_DATA/4]			= 0x08,
+	[TWSI_DATA]		= TWSI_ALLWINNER_DATA,
-	[TWSI_CONTROL/4]		= 0x0c,
+	[TWSI_CONTROL]		= TWSI_ALLWINNER_CONTROL,
-	[TWSI_STATUS/4]			= 0x10,
+	[TWSI_STATUS]		= TWSI_ALLWINNER_STATUS,
-	[TWSI_SOFTRESET/4]		= 0x18,
+	[TWSI_BAUDRATE]		= TWSI_ALLWINNER_BAUDRATE,
-};
+	[TWSI_SOFTRESET]	= TWSI_ALLWINNER_SOFTRESET,
 static uint8_t sunxi_twi_regmap_wr[] = {
 	[TWSI_SLAVEADDR/4]		= 0x00,
 	[TWSI_EXTEND_SLAVEADDR/4]	= 0x04,
 	[TWSI_DATA/4]			= 0x08,
 	[TWSI_CONTROL/4]		= 0x0c,
 	[TWSI_BAUDRATE/4]		= 0x14,
 	[TWSI_SOFTRESET/4]		= 0x18,
 };
 static int sunxi_twi_match(device_t, cfdata_t, void *);
 static void sunxi_twi_attach(device_t, device_t, void *);
 struct sunxi_twi_config {
 	bool		iflg_rwc;
 };
 static const struct sunxi_twi_config sun4i_a10_i2c_config = {
 	.iflg_rwc = false,
 };
 @@ -96,64 +83,53 @@ CFATTACH_DECL_NEW(sunxi_twi, sizeof(stru
 static i2c_tag_t
 sunxi_twi_get_tag(device_t dev)
+{
 	struct gttwsi_softc * const sc = device_private(dev);
 	return &sc->sc_i2c;
+}
 const struct fdtbus_i2c_controller_func sunxi_twi_funcs = {
 	.get_tag = sunxi_twi_get_tag,
 };
 static uint32_t
 sunxi_twi_reg_read(struct gttwsi_softc *sc, uint32_t reg)
 	return bus_space_read_4(sc->sc_bust, sc->sc_bush, sunxi_twi_regmap_rd[reg/4]);
 static void
 sunxi_twi_reg_write(struct gttwsi_softc *sc, uint32_t reg, uint32_t val)
 	bus_space_write_4(sc->sc_bust, sc->sc_bush, sunxi_twi_regmap_wr[reg/4], val);
 static u_int
 sunxi_twi_calc_rate(u_int parent_rate, u_int n, u_int m)
+{
 	return parent_rate / (10 * (m + 1) * (1 << n));
+}
 static void
 sunxi_twi_set_clock(struct gttwsi_softc *sc, u_int parent_rate, u_int rate)
+{
 	uint32_t baud;
 	u_int n, m, best_rate;
-	baud = sunxi_twi_reg_read(sc, TWSI_BAUDRATE);
+	baud = gttwsi_read_4(sc, TWSI_BAUDRATE);
 	for (best_rate = 0, n = 0; n < 8; n++) {
 		for (m = 0; m < 16; m++) {
-			const u_int tmp_rate = sunxi_twi_calc_rate(parent_rate, n, m);
+			const u_int tmp_rate =
 			    sunxi_twi_calc_rate(parent_rate, n, m);
 			if (tmp_rate <= rate && tmp_rate > best_rate) {
 				best_rate = tmp_rate;
 				baud = __SHIFTIN(n, TWI_CCR_CLK_N) |
 				       __SHIFTIN(m, TWI_CCR_CLK_M);
+			}
+		}
+	}
-	sunxi_twi_reg_write(sc, TWSI_BAUDRATE, baud);
+	gttwsi_write_4(sc, TWSI_BAUDRATE, baud);
 	delay(10000);
+}
 static int
 sunxi_twi_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct fdt_attach_args * const faa = aux;
 	return of_match_compat_data(faa->faa_phandle, compat_data);
+}
 static void
 sunxi_twi_attach(device_t parent, device_t self, void *aux)
 @@ -192,29 +168,27 @@ sunxi_twi_attach(device_t parent, device
 			return;
+		}
 	if ((rst = fdtbus_reset_get_index(phandle, 0)) != NULL)
 		if (fdtbus_reset_deassert(rst) != 0) {
 			aprint_error(": couldn't de-assert reset\n");
 			return;
+		}
 	conf = (void *)of_search_compatible(phandle, compat_data)->data;
 	prop_dictionary_set_bool(device_properties(self), "iflg-rwc",
 	    conf->iflg_rwc);
 	/* Attach gttwsi core */
-	sc->sc_reg_read = sunxi_twi_reg_read;
+	gttwsi_attach_subr(self, bst, bsh, sunxi_twi_regmap);
 	sc->sc_reg_write = sunxi_twi_reg_write;
 	gttwsi_attach_subr(self, bst, bsh);
 	/*
 	 * Set clock rate to 100kHz.
 	 */
 	if (clk != NULL)
 		sunxi_twi_set_clock(sc, clk_get_rate(clk), 100000);
 	ih = fdtbus_intr_establish(phandle, 0, IPL_VM, 0, gttwsi_intr, sc);
 	if (ih == NULL) {
 		aprint_error_dev(self, "couldn't establish interrupt on %s\n",
 		    intrstr);
 		return;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gttwsi_core.c,v 1.11 2020/01/11 22:21:25 thorpej Exp $	*/
+/*	$NetBSD: gttwsi_core.c,v 1.12 2020/01/12 17:48:42 thorpej Exp $	*/
 /*
  * Copyright (c) 2008 Eiji Kawauchi.
  * 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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -56,127 +56,112 @@
  * 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.
  */
 //#define TWSI_DEBUG
 /*
  * Marvell Two-Wire Serial Interface (aka I2C) master driver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gttwsi_core.c,v 1.11 2020/01/11 22:21:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gttwsi_core.c,v 1.12 2020/01/12 17:48:42 thorpej Exp $");
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/condvar.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/i2c/gttwsireg.h>
 #include <dev/i2c/gttwsivar.h>
 static int	gttwsi_send_start(void *v, int flags);
 static int	gttwsi_send_stop(void *v, int flags);
 static int	gttwsi_initiate_xfer(void *v, i2c_addr_t addr, int flags);
 static int	gttwsi_read_byte(void *v, uint8_t *valp, int flags);
 static int	gttwsi_write_byte(void *v, uint8_t val, int flags);
 static int	gttwsi_wait(struct gttwsi_softc *, uint32_t, uint32_t,
 			    uint32_t, int);
-static inline uint32_t
+uint32_t
-gttwsi_default_read_4(struct gttwsi_softc *sc, uint32_t reg)
+gttwsi_read_4(struct gttwsi_softc *sc, uint32_t reg)
+{
-	uint32_t val = bus_space_read_4(sc->sc_bust, sc->sc_bush, reg);
+	const uint32_t val = bus_space_read_4(sc->sc_bust, sc->sc_bush,
 					      sc->sc_regmap[reg]);
 #ifdef TWSI_DEBUG
-	printf("I2C:R:%02x:%02x\n", reg, val);
+	printf("I2C:R:[%u]%02x:%02x\n", reg, sc->sc_regmap[reg], val);
 #else
 	DELAY(TWSI_READ_DELAY);
 #endif
 	return val;
+}
-static inline void
+void
-gttwsi_default_write_4(struct gttwsi_softc *sc, uint32_t reg, uint32_t val)
+gttwsi_write_4(struct gttwsi_softc *sc, uint32_t reg, uint32_t val)
+{
 	bus_space_write_4(sc->sc_bust, sc->sc_bush, reg, val);
 #ifdef TWSI_DEBUG
-	printf("I2C:W:%02x:%02x\n", reg, val);
+	printf("I2C:W:[%u]%02x:%02x\n", reg, sc->sc_regmap[reg], val);
 #else
 	DELAY(TWSI_WRITE_DELAY);
 #endif
 	return;
 static inline uint32_t
 gttwsi_read_4(struct gttwsi_softc *sc, uint32_t reg)
 	return sc->sc_reg_read(sc, reg);
 static inline void
 gttwsi_write_4(struct gttwsi_softc *sc, uint32_t reg, uint32_t val)
 	return sc->sc_reg_write(sc, reg, val);
+}
 /* ARGSUSED */
 void
-gttwsi_attach_subr(device_t self, bus_space_tag_t iot, bus_space_handle_t ioh)
+gttwsi_attach_subr(device_t self, bus_space_tag_t iot, bus_space_handle_t ioh,
 		   const bus_size_t *regmap)
+{
 	struct gttwsi_softc * const sc = device_private(self);
 	prop_dictionary_t cfg = device_properties(self);
 	aprint_naive("\n");
 	aprint_normal(": Marvell TWSI controller\n");
 	sc->sc_dev = self;
 	sc->sc_bust = iot;
 	sc->sc_bush = ioh;
 	sc->sc_regmap = regmap;
 	if (sc->sc_reg_read == NULL)
 		sc->sc_reg_read = gttwsi_default_read_4;
 	if (sc->sc_reg_write == NULL)
 		sc->sc_reg_write = gttwsi_default_write_4;
 	mutex_init(&sc->sc_mtx, MUTEX_DEFAULT, IPL_BIO);
 	cv_init(&sc->sc_cv, device_xname(self));
 	prop_dictionary_get_bool(cfg, "iflg-rwc", &sc->sc_iflg_rwc);
 	sc->sc_started = false;
 	iic_tag_init(&sc->sc_i2c);
 	sc->sc_i2c.ic_cookie = sc;
 	sc->sc_i2c.ic_send_start = gttwsi_send_start;
 	sc->sc_i2c.ic_send_stop = gttwsi_send_stop;
 	sc->sc_i2c.ic_initiate_xfer = gttwsi_initiate_xfer;
 	sc->sc_i2c.ic_read_byte = gttwsi_read_byte;
 	sc->sc_i2c.ic_write_byte = gttwsi_write_byte;
 	/*
 	 * Put the controller into Soft Reset.
 	 */
 	/* reset */
 	gttwsi_write_4(sc, TWSI_SOFTRESET, SOFTRESET_VAL);
+}
 void
 gttwsi_config_children(device_t self)
+{
 	struct gttwsi_softc * const sc = device_private(self);
 	struct i2cbus_attach_args iba;
 	memset(&iba, 0, sizeof(iba));
 	iba.iba_tag = &sc->sc_i2c;
 	(void) config_found_ia(sc->sc_dev, "i2cbus", &iba, iicbus_print);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: gttwsireg.h,v 1.3 2014/09/11 11:14:44 jmcneill Exp $ */
+/* $NetBSD: gttwsireg.h,v 1.4 2020/01/12 17:48:42 thorpej Exp $ */
 /*
  * Copyright (c) 2008 Eiji Kawauchi.
  * 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,47 +17,57 @@
  * 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.
  */
 #ifndef _GTTWSIREG_H_
 #define _GTTWSIREG_H_
 #include "opt_gttwsi.h"
 #define GTTWSI_SIZE		0x100
 #define	GTTWSI_NREGS		7
-#if defined(GTTWSI_ALLWINNER)
+	/* reg map indices */
-#define TWSI_SLAVEADDR		0x00
+#define	TWSI_SLAVEADDR			0
-#define TWSI_EXTEND_SLAVEADDR	0x04
+#define	TWSI_EXTEND_SLAVEADDR		1
-#define TWSI_DATA		0x08
+#define	TWSI_DATA			2
-#define TWSI_CONTROL		0x0c
+#define	TWSI_CONTROL			3
-#define TWSI_STATUS		0x10
+#define	TWSI_STATUS			4
-#define TWSI_BAUDRATE		0x14
+#define	TWSI_BAUDRATE			5
-#define TWSI_SOFTRESET		0x18
+#define	TWSI_SOFTRESET			6
 #else
-#define	TWSI_SLAVEADDR		0x00
+	/* register offsets for Allwinner implementations */
-#define	TWSI_EXTEND_SLAVEADDR	0x10
+#define	TWSI_ALLWINNER_SLAVEADDR	0x00
-#define	TWSI_DATA		0x04
+#define	TWSI_ALLWINNER_EXTEND_SLAVEADDR	0x04
-#define	TWSI_CONTROL		0x08
+#define	TWSI_ALLWINNER_DATA		0x08
-#define	TWSI_STATUS		0x0c	/* for read */
+#define	TWSI_ALLWINNER_CONTROL		0x0c
-#define	TWSI_BAUDRATE		0x0c	/* for write */
+#define	TWSI_ALLWINNER_STATUS		0x10
-#define	TWSI_SOFTRESET		0x1c
+#define	TWSI_ALLWINNER_BAUDRATE		0x14
-#endif
+#define	TWSI_ALLWINNER_SOFTRESET	0x18
 #define	TWSI_ALLWINNER_ENH_FEAT		0x1c
 #define	TWSI_ALLWINNER_LINE_CTRL	0x20
 	/* register offsets for Marvell implementations */
 #define	TWSI_MARVELL_SLAVEADDR		0x00
 #define	TWSI_MARVELL_EXTEND_SLAVEADDR	0x10
 #define	TWSI_MARVELL_DATA		0x04
 #define	TWSI_MARVELL_CONTROL		0x08
 #define	TWSI_MARVELL_STATUS		0x0c	/* for read */
 #define	TWSI_MARVELL_BAUDRATE		0x0c	/* for write */
 #define	TWSI_MARVELL_SOFTRESET		0x1c
 #define	SLAVEADDR_GCE_MASK	0x01
 #define	SLAVEADDR_SADDR_MASK	0xfe
 #define	EXTEND_SLAVEADDR_MASK	0xff
 #define	DATA_MASK		0xff
 #define	CONTROL_ACK		(1<<2)
 #define	CONTROL_IFLG		(1<<3)
 #define	CONTROL_STOP		(1<<4)
 #define	CONTROL_START		(1<<5)
 #define	CONTROL_TWSIEN		(1<<6)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gttwsivar.h,v 1.5 2019/12/25 14:08:47 thorpej Exp $	*/
+/*	$NetBSD: gttwsivar.h,v 1.6 2020/01/12 17:48:42 thorpej Exp $	*/
 /*
  * Copyright (c) 2008 Eiji Kawauchi.
  * 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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -78,25 +78,28 @@
 #include <dev/i2c/i2cvar.h>
 struct gttwsi_softc {
 	device_t sc_dev;
 	bus_space_tag_t sc_bust;
 	bus_space_handle_t sc_bush;
 	bool sc_started;
 	struct i2c_controller sc_i2c;
 	kmutex_t sc_buslock;
 	kmutex_t sc_mtx;
 	kcondvar_t sc_cv;
-	bool sc_iflg_rwc;
+	const bus_size_t *sc_regmap;	/* GTTWSI_NREGS entries */
-	uint32_t (*sc_reg_read)(struct gttwsi_softc *, uint32_t);
+	bool sc_iflg_rwc;
 	void (*sc_reg_write)(struct gttwsi_softc *, uint32_t, uint32_t);
 };
-void	gttwsi_attach_subr(device_t, bus_space_tag_t, bus_space_handle_t);
+void	gttwsi_attach_subr(device_t, bus_space_tag_t, bus_space_handle_t,
 			   const bus_size_t *);
 void	gttwsi_config_children(device_t);
 uint32_t gttwsi_read_4(struct gttwsi_softc *, uint32_t);
 void	gttwsi_write_4(struct gttwsi_softc *, uint32_t, uint32_t);
 int	gttwsi_intr(void *);
 #endif /* _DEV_MARVELL_GTTSWI_VAR_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gttwsi.c,v 1.11 2013/09/06 00:56:12 matt Exp $	*/
+/*	$NetBSD: gttwsi.c,v 1.12 2020/01/12 17:48:42 thorpej Exp $	*/
 /*
  * Copyright (c) 2008 Eiji Kawauchi.
  * 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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -56,47 +56,57 @@
  * 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.
  */
 //#define TWSI_DEBUG
 /*
  * Marvell Two-Wire Serial Interface (aka I2C) master driver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gttwsi.c,v 1.11 2013/09/06 00:56:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gttwsi.c,v 1.12 2020/01/12 17:48:42 thorpej Exp $");
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/condvar.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>
 #include <machine/cpu.h>
 #include <machine/param.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/i2c/gttwsireg.h>
 #include <dev/i2c/gttwsivar.h>
 #include <dev/marvell/marvellvar.h>
 static const bus_size_t marvell_twsi_regmap[GTTWSI_NREGS] = {
 	[TWSI_SLAVEADDR]	= TWSI_MARVELL_SLAVEADDR,
 	[TWSI_EXTEND_SLAVEADDR]	= TWSI_MARVELL_EXTEND_SLAVEADDR,
 	[TWSI_DATA]		= TWSI_MARVELL_DATA,
 	[TWSI_CONTROL]		= TWSI_MARVELL_CONTROL,
 	[TWSI_STATUS]		= TWSI_MARVELL_STATUS,
 	[TWSI_BAUDRATE]		= TWSI_MARVELL_BAUDRATE,
 	[TWSI_SOFTRESET]	= TWSI_MARVELL_SOFTRESET,
 };
 static int	gttwsi_match(device_t, cfdata_t, void *);
 static void	gttwsi_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(gttwsi_gt, sizeof(struct gttwsi_softc),
     gttwsi_match, gttwsi_attach, NULL, NULL);
 CFATTACH_DECL_NEW(gttwsi_mbus, sizeof(struct gttwsi_softc),
     gttwsi_match, gttwsi_attach, NULL, NULL);
 /* ARGSUSED */
 static int
 gttwsi_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct marvell_attach_args *mva = aux;
 @@ -114,20 +124,20 @@ gttwsi_match(device_t parent, cfdata_t m
 /* ARGSUSED */
 static void
 gttwsi_attach(device_t parent, device_t self, void *args)
+{
 	struct marvell_attach_args *mva = args;
 	bus_space_handle_t ioh;
 	if (bus_space_subregion(mva->mva_iot, mva->mva_ioh, mva->mva_offset,
 	    mva->mva_size, &ioh)) {
 		aprint_error(": cannot map registers\n");
 		return;
+	}
-	gttwsi_attach_subr(self, mva->mva_iot, ioh);
+	gttwsi_attach_subr(self, mva->mva_iot, ioh, marvell_twsi_regmap);
 	marvell_intr_establish(mva->mva_irq, IPL_BIO, gttwsi_intr,
 	    device_private(self));
 	gttwsi_config_children(self);
+}

 @@ -1,14 +1,14 @@
-#	$NetBSD: files.i2c,v 1.107 2020/01/03 18:00:05 jmcneill Exp $
+#	$NetBSD: files.i2c,v 1.108 2020/01/12 17:48:42 thorpej Exp $
 obsolete defflag	opt_i2cbus.h		I2C_SCAN
 define	i2cbus { }
 define	i2cexec
 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
 @@ -45,27 +45,26 @@ define	mt2131: i2cexec
 file	dev/i2c/mt2131.c			mt2131
 # Conexant/Samsung CX24227/S5H1409 demodulator
 define	cx24227: i2cexec
 file	dev/i2c/cx24227.c			cx24227
+#
 # I2C master devices
+#
 define	motoi2c
 file	dev/i2c/motoi2c.c			motoi2c
 define	mvi2c
 file	dev/i2c/gttwsi_core.c			mvi2c
 defflag opt_gttwsi.h				GTTWSI_ALLWINNER
+#
 # I2C client devices
+#
 # M41T00 Real Time Clock
 device	m41trtc
 attach	m41trtc at iic
 file	dev/i2c/m41t00.c			m41trtc
 # M41ST84 Real Time Clock
 device	strtc
 attach	strtc at iic