Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/arm/rockchip/rk_i2c.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/arm/rockchip/rk_i2c.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.8.2.2 retrieving revision 1.9 diff -u -p -r1.8.2.2 -r1.9 --- src/sys/arch/arm/rockchip/rk_i2c.c 2021/04/03 22:28:18 1.8.2.2 +++ src/sys/arch/arm/rockchip/rk_i2c.c 2020/12/23 16:02:11 1.9 @@ -1,4 +1,4 @@ -/* $NetBSD: rk_i2c.c,v 1.8.2.2 2021/04/03 22:28:18 thorpej Exp $ */ +/* $NetBSD: rk_i2c.c,v 1.9 2020/12/23 16:02:11 thorpej Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -28,7 +28,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: rk_i2c.c,v 1.8.2.2 2021/04/03 22:28:18 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rk_i2c.c,v 1.9 2020/12/23 16:02:11 thorpej Exp $"); #include #include @@ -100,9 +100,9 @@ __KERNEL_RCSID(0, "$NetBSD: rk_i2c.c,v 1 #define RKI2C_TXDATA(n) (0x100 + (n) * 4) #define RKI2C_RXDATA(n) (0x200 + (n) * 4) -static const struct device_compatible_entry compat_data[] = { - { .compat = "rockchip,rk3399-i2c" }, - DEVICE_COMPAT_EOL +static const char * const compatible[] = { + "rockchip,rk3399-i2c", + NULL }; struct rk_i2c_softc { @@ -366,7 +366,7 @@ rk_i2c_match(device_t parent, cfdata_t c { struct fdt_attach_args * const faa = aux; - return of_compatible_match(faa->faa_phandle, compat_data); + return of_match_compatible(faa->faa_phandle, compatible); } static void