 @@ -1,14 +1,14 @@
-/* $NetBSD: pcagpio.c,v 1.3 2020/02/02 06:43:14 macallan Exp $ */
+/* $NetBSD: pcagpio.c,v 1.4 2020/10/27 20:13:21 jdc Exp $ */
 /*-
  * Copyright (c) 2020 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.
 @@ -21,118 +21,130 @@
  * 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.
  */
 /*
  * a driver for Philips Semiconductor PCA9555 GPIO controllers
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcagpio.c,v 1.3 2020/02/02 06:43:14 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcagpio.c,v 1.4 2020/10/27 20:13:21 jdc Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #ifdef PCAGPIO_DEBUG
 #include <sys/kernel.h>
 #endif
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/led.h>
 #ifdef PCAGPIO_DEBUG
 #define DPRINTF printf
 #else
 #define DPRINTF if (0) printf
 #endif
 /* commands */
 #define PCAGPIO_INPUT	0x00	/* line status */
 #define PCAGPIO_OUTPUT	0x01	/* output status */
 #define PCAGPIO_REVERT	0x02	/* revert input if set */
 #define PCAGPIO_CONFIG	0x03	/* input if set, output if not */
 static int	pcagpio_match(device_t, cfdata_t, void *);
 static void	pcagpio_attach(device_t, device_t, void *);
 static int	pcagpio_detach(device_t, int);
 #ifdef PCAGPIO_DEBUG
 static void	pcagpio_timeout(void *);
 #endif
 /* we can only pass one cookie to led_attach() but we need several values... */
 struct pcagpio_led {
 	void *cookie;
 	uint32_t mask, v_on, v_off;
 };
 struct pcagpio_softc {
 	device_t	sc_dev;
 	i2c_tag_t	sc_i2c;
 	i2c_addr_t	sc_addr;
 	int		sc_is_16bit;
 	uint32_t	sc_state;
 	struct pcagpio_led sc_leds[16];
 	int		sc_nleds;
 #ifdef PCAGPIO_DEBUG
 	uint32_t	sc_dir, sc_in;
 	callout_t	sc_timer;
 #endif
 };
 static void 	pcagpio_writereg(struct pcagpio_softc *, int, uint32_t);
 static uint32_t pcagpio_readreg(struct pcagpio_softc *, int);
 static void	pcagpio_attach_led(
 			struct pcagpio_softc *, char *, int, int, int);
 static int	pcagpio_get(void *);
 static void	pcagpio_set(void *, int);
 CFATTACH_DECL_NEW(pcagpio, sizeof(struct pcagpio_softc),
-    pcagpio_match, pcagpio_attach, NULL, NULL);
+    pcagpio_match, pcagpio_attach, pcagpio_detach, NULL);
 static const struct device_compatible_entry compat_data[] = {
 	{ "i2c-pca9555",	1 },
 	{ "pca9555",		1 },
 	{ "i2c-pca9556",	0 },
 	{ "pca9556",		0 },
 	{ NULL,			0 }
 };
 static int
 pcagpio_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct i2c_attach_args *ia = aux;
 	int match_result;
 	if (iic_use_direct_match(ia, match, compat_data, &match_result))
 		return match_result;
 	return 0;
+}
 #ifdef PCAGPIO_DEBUG
 static void
-printdir(uint32_t val, uint32_t mask, char letter)
+printdir(char* name, uint32_t val, uint32_t mask, char letter)
+{
 	char flags[17], bits[17];
 	uint32_t bit = 0x8000;
 	int i;
 	val &= mask;
 	for (i = 0; i < 16; i++) {
 		flags[i] = (mask & bit) ? letter : '-';
 		bits[i] = (val & bit) ? 'X' : ' ';
 		bit = bit >> 1;
+	}
 	flags[16] = 0;
 	bits[16] = 0;
-	printf("dir: %s\n", flags);
+	printf("%s: dir: %s\n", name, flags);
-	printf("lvl: %s\n", bits);
+	printf("%s: lvl: %s\n", name, bits);
+}
 #endif
 static void
 pcagpio_attach(device_t parent, device_t self, void *aux)
+{
 	struct pcagpio_softc *sc = device_private(self);
 	struct i2c_attach_args *ia = aux;
 	const struct device_compatible_entry *dce;
 	prop_dictionary_t dict = device_properties(self);
 	prop_array_t pins;
 	prop_dictionary_t pin;
 @@ -141,36 +153,41 @@ pcagpio_attach(device_t parent, device_t
 	sc->sc_addr = ia->ia_addr;
 	sc->sc_nleds = 0;
 	aprint_naive("\n");
 	sc->sc_is_16bit = 0;
 	if (iic_compatible_match(ia, compat_data, &dce))
 		sc->sc_is_16bit = dce->data;
 	aprint_normal(": %s\n", sc->sc_is_16bit ? "PCA9555" : "PCA9556");
 	sc->sc_state = pcagpio_readreg(sc, PCAGPIO_OUTPUT);
 #ifdef PCAGPIO_DEBUG
-	uint32_t dir, in, out;
+	uint32_t in, out;
-	dir = pcagpio_readreg(sc, PCAGPIO_CONFIG);
+	sc->sc_dir = pcagpio_readreg(sc, PCAGPIO_CONFIG);
-	in = pcagpio_readreg(sc, PCAGPIO_INPUT);
+	sc->sc_in = pcagpio_readreg(sc, PCAGPIO_INPUT);
 	in = sc-> sc_in;
 	out = sc->sc_state;
-	out &= ~dir;
+	out &= ~sc->sc_dir;
-	in &= dir;
+	in &= sc->sc_dir;
-	printdir(in, dir, 'I');
+	printdir(sc->sc_dev->dv_xname, in, sc->sc_dir, 'I');
-	printdir(out, ~dir, 'O');
+	printdir(sc->sc_dev->dv_xname, out, ~sc->sc_dir, 'O');
 	callout_init(&sc->sc_timer, CALLOUT_MPSAFE);
 	callout_reset(&sc->sc_timer, hz*20, pcagpio_timeout, sc);
 #endif
 	pins = prop_dictionary_get(dict, "pins");
 	if (pins != NULL) {
 		int i, num, def;
 		char name[32];
 		const char *nptr;
 		bool ok = TRUE, act;
 		for (i = 0; i < prop_array_count(pins); i++) {
 			nptr = NULL;
 			pin = prop_array_get(pins, i);
 			ok &= prop_dictionary_get_cstring_nocopy(pin, "name",
 @@ -179,26 +196,69 @@ pcagpio_attach(device_t parent, device_t
 			ok &= prop_dictionary_get_uint32(pin, "pin", &num);
 			ok &= prop_dictionary_get_bool(
 			    pin, "active_high", &act);
 			/* optional default state */
 			def = -1;
 			prop_dictionary_get_int32(pin, "default_state", &def);
 			if (ok) {
 				pcagpio_attach_led(sc, name, num, act, def);
+			}
+		}
+	}
+}
 static int
 pcagpio_detach(device_t self, int flags)
+{
 #ifdef PCAGPIO_DEBUG
 	struct pcagpio_softc *sc = device_private(self);
 	callout_halt(&sc->sc_timer, NULL);
 	callout_destroy(&sc->sc_timer);
 #endif
 	return 0;
+}
 #ifdef PCAGPIO_DEBUG
 static void
 pcagpio_timeout(void *v)
+{
 	struct pcagpio_softc *sc = v;
 	uint32_t out, dir, in, o_out, o_in;
 	out = pcagpio_readreg(sc, PCAGPIO_OUTPUT);
 	dir = pcagpio_readreg(sc, PCAGPIO_CONFIG);
 	in = pcagpio_readreg(sc, PCAGPIO_INPUT);
 	if (out != sc->sc_state || dir != sc->sc_dir || in != sc->sc_in) {
 		aprint_normal_dev(sc->sc_dev, "status change\n");
 		o_out = sc->sc_state;
 		o_in = sc->sc_in;
 		o_out &= ~sc->sc_dir;
 		o_in &= sc->sc_dir;
 		printdir(sc->sc_dev->dv_xname, o_in, sc->sc_dir, 'I');
 		printdir(sc->sc_dev->dv_xname, o_out, ~sc->sc_dir, 'O');
 		sc->sc_state = out;
 		sc->sc_dir = dir;
 		sc->sc_in = in;
 		out &= ~sc->sc_dir;
 		in &= sc->sc_dir;
 		printdir(sc->sc_dev->dv_xname, in, sc->sc_dir, 'I');
 		printdir(sc->sc_dev->dv_xname, out, ~sc->sc_dir, 'O');
+	}
 	callout_reset(&sc->sc_timer, hz*60, pcagpio_timeout, sc);
+}
 #endif
 static void
 pcagpio_writereg(struct pcagpio_softc *sc, int reg, uint32_t val)
+{
 	uint8_t cmd;
 	iic_acquire_bus(sc->sc_i2c, 0);
 	if (sc->sc_is_16bit) {
 		uint16_t creg;
 		cmd = reg << 1;
 		creg = htole16(val);
 		iic_exec(sc->sc_i2c, I2C_OP_WRITE_WITH_STOP,
 		    sc->sc_addr, &cmd, 1, &creg, 2, 0);
 	} else {