 @@ -1,14 +1,14 @@
-/* $NetBSD: ssdfb_i2c.c,v 1.8 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: ssdfb_i2c.c,v 1.9 2021/01/28 14:42:45 thorpej Exp $ */
 /*
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tobias Nygren.
+ *
  * 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: ssdfb_i2c.c,v 1.8 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssdfb_i2c.c,v 1.9 2021/01/28 14:42:45 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/rasops/rasops.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/ic/ssdfbvar.h>
 struct ssdfb_i2c_softc {
 	struct		ssdfb_softc sc;
 	i2c_tag_t	sc_i2c_tag;
 	i2c_addr_t	sc_i2c_addr;
 	size_t		sc_transfer_size;
 @@ -57,28 +57,32 @@ static int	ssdfb_i2c_cmd(void *, uint8_t
 static int	ssdfb_i2c_transfer_rect(void *, uint8_t, uint8_t, uint8_t,
 				uint8_t, uint8_t *, size_t, bool);
 static int	ssdfb_i2c_transfer_rect_ssd1306(void *, uint8_t, uint8_t,
 				uint8_t, uint8_t, uint8_t *, size_t, bool);
 static int	ssdfb_i2c_transfer_rect_sh1106(void *, uint8_t, uint8_t,
 				uint8_t, uint8_t, uint8_t *, size_t, bool);
 static int	ssdfb_smbus_transfer_rect(void *, uint8_t, uint8_t, uint8_t,
 				uint8_t, uint8_t *, size_t, bool);
 CFATTACH_DECL_NEW(ssdfb_iic, sizeof(struct ssdfb_i2c_softc),
     ssdfb_i2c_match, ssdfb_i2c_attach, ssdfb_i2c_detach, NULL);
 static const struct device_compatible_entry compat_data[] = {
-	{ .compat = "solomon,ssd1306fb-i2c" },
+	{ .compat = "solomon,ssd1306fb-i2c",
-	{ .compat = "sino,sh1106fb-i2c" },
+	  .value = SSDFB_PRODUCT_SSD1306_GENERIC },
 	{ .compat = "sino,sh1106fb-i2c",
 	  .value = SSDFB_PRODUCT_SH1106_GENERIC },
 	DEVICE_COMPAT_EOL
 };
 static int
 ssdfb_i2c_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;
 	switch (ia->ia_addr) {
 @@ -87,40 +91,32 @@ ssdfb_i2c_match(device_t parent, cfdata_
 		return I2C_MATCH_ADDRESS_ONLY;
+	}
 	return 0;
+}
 static void
 ssdfb_i2c_attach(device_t parent, device_t self, void *aux)
+{
 	struct ssdfb_i2c_softc *sc = device_private(self);
 	struct cfdata *cf = device_cfdata(self);
 	struct i2c_attach_args *ia = aux;
 	int flags = cf->cf_flags;
 	int i;
 	if ((flags & SSDFB_ATTACH_FLAG_PRODUCT_MASK) == SSDFB_PRODUCT_UNKNOWN) {
-		for (i = 0; i < ia->ia_ncompat; i++) {
+		const struct device_compatible_entry *dce =
-			if (strncmp("solomon,ssd1306", ia->ia_compat[i], 15)
+		    iic_compatible_lookup(ia, compat_data);
-			    == 0) {
+		if (dce != NULL) {
-				flags |= SSDFB_PRODUCT_SSD1306_GENERIC;
+			flags |= (int)dce->value;
 				break;
 			else if (strncmp("sino,sh1106", ia->ia_compat[i], 11)
 			    == 0) {
 				flags |= SSDFB_PRODUCT_SH1106_GENERIC;
 				break;
+		}
+	}
 	if ((flags & SSDFB_ATTACH_FLAG_PRODUCT_MASK) == SSDFB_PRODUCT_UNKNOWN)
 		flags |= SSDFB_PRODUCT_SSD1306_GENERIC;
 	flags |= SSDFB_ATTACH_FLAG_MPSAFE;
 	sc->sc.sc_dev = self;
 	sc->sc_i2c_tag = ia->ia_tag;
 	sc->sc_i2c_addr = ia->ia_addr;
 	sc->sc.sc_cookie = (void *)sc;
 	sc->sc.sc_cmd = ssdfb_i2c_cmd;
 	sc->sc.sc_transfer_rect = ssdfb_i2c_transfer_rect;