 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcf8563.c,v 1.7 2015/04/11 20:05:44 joerg Exp $	*/
+/*	$NetBSD: pcf8563.c,v 1.8 2017/10/07 20:18:16 jmcneill Exp $	*/
 /*
  * Copyright (c) 2011 Jonathan A. Kollasch
  * 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,66 +16,80 @@
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
  */
 /* XXX */
 #if defined(__arm__) || defined(__aarch64__)
 #include "opt_fdt.h"
 #endif
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcf8563.c,v 1.7 2015/04/11 20:05:44 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcf8563.c,v 1.8 2017/10/07 20:18:16 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <dev/clock_subr.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/i2c/pcf8563reg.h>
 #ifdef FDT
 #include <dev/fdt/fdtvar.h>
 #endif
 static const char *compatible[] = {
 	"nxp,pcf8563",
 	"pcf8563rtc",
 	NULL
 };
 struct pcf8563rtc_softc {
 	device_t sc_dev;
 	i2c_tag_t sc_tag;
 	int sc_addr;
 	struct todr_chip_handle sc_todr;
 };
 static int pcf8563rtc_match(device_t, cfdata_t, void *);
 static void pcf8563rtc_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(pcf8563rtc, sizeof(struct pcf8563rtc_softc),
     pcf8563rtc_match, pcf8563rtc_attach, NULL, NULL);
 static int pcf8563rtc_clock_read(struct pcf8563rtc_softc *, struct clock_ymdhms *);
 static int pcf8563rtc_clock_write(struct pcf8563rtc_softc *, struct clock_ymdhms *);
 static int pcf8563rtc_gettime(struct todr_chip_handle *, struct clock_ymdhms *);
 static int pcf8563rtc_settime(struct todr_chip_handle *, struct clock_ymdhms *);
 static int
 pcf8563rtc_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct i2c_attach_args *ia = aux;
 	if (ia->ia_name) {
 		/* direct config - check name */
-		if (strcmp(ia->ia_name, "pcf8563rtc") == 0)
+		return iic_compat_match(ia, compatible);
 			return 1;
 	} else {
 		/* indirect config - check typical address */
 		if (ia->ia_addr == PCF8563_ADDR)
 			return 1;
+	}
 	return 0;
+}
 static void
 pcf8563rtc_attach(device_t parent, device_t self, void *aux)
+{
 	struct pcf8563rtc_softc *sc = device_private(self);
 	struct i2c_attach_args *ia = aux;
 @@ -88,27 +102,31 @@ pcf8563rtc_attach(device_t parent, devic
 	sc->sc_addr = ia->ia_addr;
 	sc->sc_todr.cookie = sc;
 	sc->sc_todr.todr_gettime_ymdhms = pcf8563rtc_gettime;
 	sc->sc_todr.todr_settime_ymdhms = pcf8563rtc_settime;
 	sc->sc_todr.todr_setwen = NULL;
 	iic_acquire_bus(sc->sc_tag, I2C_F_POLL);
 	iic_smbus_write_byte(sc->sc_tag, sc->sc_addr, PCF8563_R_CS1, 0,
 	    I2C_F_POLL);
 	iic_smbus_write_byte(sc->sc_tag, sc->sc_addr, PCF8563_R_CS2, 0,
 	    I2C_F_POLL);
 	iic_release_bus(sc->sc_tag, I2C_F_POLL);
 #ifdef FDT
 	fdtbus_todr_attach(self, ia->ia_cookie, &sc->sc_todr);
 #else
 	todr_attach(&sc->sc_todr);
 #endif
+}
 static int
 pcf8563rtc_gettime(struct todr_chip_handle *ch, struct clock_ymdhms *dt)
+{
 	struct pcf8563rtc_softc *sc = ch->cookie;
 	if (pcf8563rtc_clock_read(sc, dt) == 0)
 		return -1;
 	return 0;
+}