Wed Dec 16 08:05:38 2015 UTC ()

Add direct configuration support via compatible names.


(jdc)

diff -r1.43 -r1.44 src/sys/dev/i2c/dbcool.c

--- src/sys/dev/i2c/dbcool.c 2015/04/23 23:23:00	1.43
+++ src/sys/dev/i2c/dbcool.c 2015/12/16 08:05:38	1.44

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dbcool.c,v 1.43 2015/04/23 23:23:00 pgoyette Exp $ */
+/*	$NetBSD: dbcool.c,v 1.44 2015/12/16 08:05:38 jdc Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Goyette
+ *
  * 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.
 @@ -40,27 +40,27 @@
  *	http://www.onsemi.com/pub/Collateral/ADT7466.PDF
  *	http://www.onsemi.com/pub/Collateral/ADT7467-D.PDF
  *	http://www.onsemi.com/pub/Collateral/ADT7468-D.PDF
  *	http://www.onsemi.com/pub/Collateral/ADT7473-D.PDF
  *	http://www.onsemi.com/pub/Collateral/ADT7475-D.PDF
  *	http://www.onsemi.com/pub/Collateral/ADT7476-D.PDF
  *	http://www.onsemi.com/pub/Collateral/ADT7490-D.PDF
  *	http://www.smsc.com/media/Downloads_Public/Data_Sheets/6d103s.pdf
+ *
  * (URLs are correct as of October 5, 2008)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.43 2015/04/23 23:23:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.44 2015/12/16 08:05:38 jdc Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 #include <sys/module.h>
 #include <dev/i2c/dbcool_var.h>
 #include <dev/i2c/dbcool_reg.h>
 /* Config interface */
 @@ -721,43 +721,54 @@ struct chip_id chip_table[] = {
 	{ 0, 0, 0, NULL, NULL, 0, 0, NULL }
 };
 static const char *behavior[] = {
 	"remote1",	"local",	"remote2",	"full-speed",
 	"disabled",	"local+remote2","all-temps",	"manual"
 };
 static char dbcool_cur_behav[16];
 CFATTACH_DECL_NEW(dbcool, sizeof(struct dbcool_softc),
     dbcool_match, dbcool_attach, dbcool_detach, NULL);
 static const char * dbcool_compats[] = {
 	"i2c-adm1031",
 	NULL
 };
 int
 dbcool_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct i2c_attach_args *ia = aux;
 	struct dbcool_chipset dc;
 	dc.dc_tag = ia->ia_tag;
 	dc.dc_addr = ia->ia_addr;
 	dc.dc_chip = NULL;
 	dc.dc_readreg = dbcool_readreg;
 	dc.dc_writereg = dbcool_writereg;
-	/* no probing if we attach to iic, but verify chip id  and address */
+	/* Direct config - match compats */
-	if ((ia->ia_addr & DBCOOL_ADDRMASK) != DBCOOL_ADDR)
+	if (ia->ia_name) {
-		return 0;
+		if (ia->ia_ncompat > 0) {
-	if (dbcool_chip_ident(&dc) >= 0)
+			if (iic_compat_match(ia, dbcool_compats))
-		return 1;
+				return 1;
+		}
 	/* Indirect config - check address and chip ID */
 	} else {
 		if ((ia->ia_addr & DBCOOL_ADDRMASK) != DBCOOL_ADDR)
 			return 0;
 		if (dbcool_chip_ident(&dc) >= 0)
 			return 1;
+	}
 	return 0;
+}
 void
 dbcool_attach(device_t parent, device_t self, void *aux)
+{
 	struct dbcool_softc *sc = device_private(self);
 	struct i2c_attach_args *args = aux;
 	uint8_t ver;
 	sc->sc_dc.dc_addr = args->ia_addr;
 	sc->sc_dc.dc_tag = args->ia_tag;
 	sc->sc_dc.dc_chip = NULL;