Module Name: src
Committed By: thorpej
Date: Sat May 8 16:46:43 UTC 2021
Modified Files:
src/sys/dev/i2c [thorpej-i2c-spi-conf]: ac100.c anxedp.c as3722.c
axp20x.c axppmic.c cwfg.c es8316ac.c fan53555.c max77620.c
pca9685.c pcf8563.c rkpmic.c sy8106a.c tcagpio.c tcakp.c tda19988.c
tps65217pmic.c twl4030.c
Log Message:
ia->ia_cookie -> devhandle_to_of(device_handle(self))
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/dev/i2c/ac100.c \
src/sys/dev/i2c/tda19988.c
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/dev/i2c/anxedp.c \
src/sys/dev/i2c/pca9685.c src/sys/dev/i2c/twl4030.c
cvs rdiff -u -r1.23 -r1.23.2.1 src/sys/dev/i2c/as3722.c
cvs rdiff -u -r1.20 -r1.20.2.1 src/sys/dev/i2c/axp20x.c
cvs rdiff -u -r1.34 -r1.34.2.1 src/sys/dev/i2c/axppmic.c
cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/dev/i2c/cwfg.c
cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/dev/i2c/es8316ac.c
cvs rdiff -u -r1.9 -r1.9.4.1 src/sys/dev/i2c/fan53555.c
cvs rdiff -u -r1.11 -r1.11.4.1 src/sys/dev/i2c/max77620.c
cvs rdiff -u -r1.15 -r1.15.4.1 src/sys/dev/i2c/pcf8563.c
cvs rdiff -u -r1.13 -r1.13.2.1 src/sys/dev/i2c/rkpmic.c
cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/dev/i2c/sy8106a.c \
src/sys/dev/i2c/tcagpio.c
cvs rdiff -u -r1.16 -r1.16.2.1 src/sys/dev/i2c/tcakp.c
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/dev/i2c/tps65217pmic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/ac100.c
diff -u src/sys/dev/i2c/ac100.c:1.7 src/sys/dev/i2c/ac100.c:1.7.4.1
--- src/sys/dev/i2c/ac100.c:1.7 Wed Jan 27 02:29:48 2021
+++ src/sys/dev/i2c/ac100.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ac100.c,v 1.7 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: ac100.c,v 1.7.4.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_fdt.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ac100.c,v 1.7 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ac100.c,v 1.7.4.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -153,7 +153,7 @@ ac100_attach(device_t parent, device_t s
sc->sc_todr.cookie = sc;
#ifdef FDT
- const int phandle = ia->ia_cookie;
+ const int phandle = devhandle_to_of(device_handle(self));
const int rtc_phandle = of_find_firstchild_byname(phandle, "rtc");
if (rtc_phandle > 0)
fdtbus_todr_attach(self, rtc_phandle, &sc->sc_todr);
Index: src/sys/dev/i2c/tda19988.c
diff -u src/sys/dev/i2c/tda19988.c:1.7 src/sys/dev/i2c/tda19988.c:1.7.4.1
--- src/sys/dev/i2c/tda19988.c:1.7 Wed Jan 27 02:29:48 2021
+++ src/sys/dev/i2c/tda19988.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tda19988.c,v 1.7 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: tda19988.c,v 1.7.4.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2015 Oleksandr Tymoshenko <go...@freebsd.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tda19988.c,v 1.7 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tda19988.c,v 1.7.4.1 2021/05/08 16:46:43 thorpej Exp $");
/*
* NXP TDA19988 HDMI encoder
@@ -904,7 +904,7 @@ tda19988_attach(device_t parent, device_
{
struct tda19988_softc *sc = device_private(self);
struct i2c_attach_args * const ia = aux;
- const int phandle = ia->ia_cookie;
+ const int phandle = devhandle_to_of(device_handle(self));
sc->sc_dev = self;
sc->sc_phandle = phandle;
Index: src/sys/dev/i2c/anxedp.c
diff -u src/sys/dev/i2c/anxedp.c:1.6 src/sys/dev/i2c/anxedp.c:1.6.4.1
--- src/sys/dev/i2c/anxedp.c:1.6 Wed Jan 27 02:29:48 2021
+++ src/sys/dev/i2c/anxedp.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: anxedp.c,v 1.6 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: anxedp.c,v 1.6.4.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: anxedp.c,v 1.6 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: anxedp.c,v 1.6.4.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -434,7 +434,7 @@ anxedp_attach(device_t parent, device_t
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
sc->sc_addr = ia->ia_addr;
- sc->sc_phandle = ia->ia_cookie;
+ sc->sc_phandle = devhandle_to_of(device_handle(self));
aprint_naive("\n");
aprint_normal(": eDP TX\n");
Index: src/sys/dev/i2c/pca9685.c
diff -u src/sys/dev/i2c/pca9685.c:1.6 src/sys/dev/i2c/pca9685.c:1.6.4.1
--- src/sys/dev/i2c/pca9685.c:1.6 Wed Jan 27 02:29:48 2021
+++ src/sys/dev/i2c/pca9685.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pca9685.c,v 1.6 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: pca9685.c,v 1.6.4.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2018, 2019 Jason R. Thorpe
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pca9685.c,v 1.6 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pca9685.c,v 1.6.4.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -526,7 +526,7 @@ pcapwm_attach(device_t parent, device_t
struct pcapwm_softc * const sc = device_private(self);
struct i2c_attach_args * const ia = aux;
struct clk *clk;
- const int phandle = (int)ia->ia_cookie;
+ const int phandle = devhandle_to_of(device_handle(self));
u_int index;
int error;
Index: src/sys/dev/i2c/twl4030.c
diff -u src/sys/dev/i2c/twl4030.c:1.6 src/sys/dev/i2c/twl4030.c:1.6.4.1
--- src/sys/dev/i2c/twl4030.c:1.6 Wed Jan 27 03:10:21 2021
+++ src/sys/dev/i2c/twl4030.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: twl4030.c,v 1.6 2021/01/27 03:10:21 thorpej Exp $ */
+/* $NetBSD: twl4030.c,v 1.6.4.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_fdt.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twl4030.c,v 1.6 2021/01/27 03:10:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twl4030.c,v 1.6.4.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -382,7 +382,7 @@ twl_attach(device_t parent, device_t sel
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
sc->sc_addr = ia->ia_addr;
- sc->sc_phandle = ia->ia_cookie;
+ sc->sc_phandle = devhandle_to_of(device_handle(self));
sc->sc_npins = TWL_PIN_COUNT;
aprint_naive("\n");
Index: src/sys/dev/i2c/as3722.c
diff -u src/sys/dev/i2c/as3722.c:1.23 src/sys/dev/i2c/as3722.c:1.23.2.1
--- src/sys/dev/i2c/as3722.c:1.23 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/as3722.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: as3722.c,v 1.23 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: as3722.c,v 1.23.2.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_fdt.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1.23 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1.23.2.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -261,7 +261,7 @@ as3722_attach(device_t parent, device_t
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
sc->sc_addr = ia->ia_addr;
- sc->sc_phandle = ia->ia_cookie;
+ sc->sc_phandle = devhandle_to_of(device_handle(self));
aprint_naive("\n");
aprint_normal(": AMS AS3722\n");
Index: src/sys/dev/i2c/axp20x.c
diff -u src/sys/dev/i2c/axp20x.c:1.20 src/sys/dev/i2c/axp20x.c:1.20.2.1
--- src/sys/dev/i2c/axp20x.c:1.20 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/axp20x.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: axp20x.c,v 1.20 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: axp20x.c,v 1.20.2.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: axp20x.c,v 1.20 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: axp20x.c,v 1.20.2.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -241,7 +241,7 @@ axp20x_attach(device_t parent, device_t
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
sc->sc_addr = ia->ia_addr;
- sc->sc_phandle = ia->ia_cookie;
+ sc->sc_phandle = devhandle_to_of(device_handle(self));
error = axp20x_read(sc, AXP_INPUT_STATUS,
&sc->sc_inputstatus, 1);
Index: src/sys/dev/i2c/axppmic.c
diff -u src/sys/dev/i2c/axppmic.c:1.34 src/sys/dev/i2c/axppmic.c:1.34.2.1
--- src/sys/dev/i2c/axppmic.c:1.34 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/axppmic.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: axppmic.c,v 1.34 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: axppmic.c,v 1.34.2.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2014-2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: axppmic.c,v 1.34 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: axppmic.c,v 1.34.2.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -955,7 +955,7 @@ axppmic_attach(device_t parent, device_t
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
sc->sc_addr = ia->ia_addr;
- sc->sc_phandle = ia->ia_cookie;
+ sc->sc_phandle = devhandle_to_of(device_handle(self));
sc->sc_conf = c;
aprint_naive("\n");
Index: src/sys/dev/i2c/cwfg.c
diff -u src/sys/dev/i2c/cwfg.c:1.4 src/sys/dev/i2c/cwfg.c:1.4.4.1
--- src/sys/dev/i2c/cwfg.c:1.4 Wed Jan 27 02:29:48 2021
+++ src/sys/dev/i2c/cwfg.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cwfg.c,v 1.4 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: cwfg.c,v 1.4.4.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cwfg.c,v 1.4 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cwfg.c,v 1.4.4.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -418,7 +418,7 @@ cwfg_attach(device_t parent, device_t se
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
sc->sc_addr = ia->ia_addr;
- sc->sc_phandle = ia->ia_cookie;
+ sc->sc_phandle = devhandle_to_of(device_handle(self));
cwfg_lock(sc);
error = cwfg_read(sc, VERSION_REG, &ver);
Index: src/sys/dev/i2c/es8316ac.c
diff -u src/sys/dev/i2c/es8316ac.c:1.5 src/sys/dev/i2c/es8316ac.c:1.5.4.1
--- src/sys/dev/i2c/es8316ac.c:1.5 Wed Jan 27 02:29:48 2021
+++ src/sys/dev/i2c/es8316ac.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: es8316ac.c,v 1.5 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: es8316ac.c,v 1.5.4.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: es8316ac.c,v 1.5 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: es8316ac.c,v 1.5.4.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -690,12 +690,12 @@ escodec_attach(device_t parent, device_t
{
struct escodec_softc * const sc = device_private(self);
struct i2c_attach_args * const ia = aux;
- const int phandle = ia->ia_cookie;
+ const int phandle = devhandle_to_of(device_handle(self));
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
sc->sc_addr = ia->ia_addr;
- sc->sc_phandle = ia->ia_cookie;
+ sc->sc_phandle = devhandle_to_of(device_handle(self));
sc->sc_swvol = 0xff;
sc->sc_clk = fdtbus_clock_get(phandle, "mclk");
Index: src/sys/dev/i2c/fan53555.c
diff -u src/sys/dev/i2c/fan53555.c:1.9 src/sys/dev/i2c/fan53555.c:1.9.4.1
--- src/sys/dev/i2c/fan53555.c:1.9 Wed Jan 27 02:29:48 2021
+++ src/sys/dev/i2c/fan53555.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fan53555.c,v 1.9 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: fan53555.c,v 1.9.4.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fan53555.c,v 1.9 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fan53555.c,v 1.9.4.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -307,7 +307,7 @@ fan53555_attach(device_t parent, device_
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
sc->sc_addr = ia->ia_addr;
- sc->sc_phandle = ia->ia_cookie;
+ sc->sc_phandle = devhandle_to_of(device_handle(self));
compat = iic_compatible_lookup(ia, compat_data);
KASSERT(compat != NULL);
Index: src/sys/dev/i2c/max77620.c
diff -u src/sys/dev/i2c/max77620.c:1.11 src/sys/dev/i2c/max77620.c:1.11.4.1
--- src/sys/dev/i2c/max77620.c:1.11 Wed Jan 27 02:29:48 2021
+++ src/sys/dev/i2c/max77620.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: max77620.c,v 1.11 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: max77620.c,v 1.11.4.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: max77620.c,v 1.11 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: max77620.c,v 1.11.4.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -281,7 +281,7 @@ max77620_attach(device_t parent, device_
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
sc->sc_addr = ia->ia_addr;
- sc->sc_phandle = ia->ia_cookie;
+ sc->sc_phandle = devhandle_to_of(device_handle(self));
aprint_naive("\n");
aprint_normal(": MAX77620 Power Management IC\n");
Index: src/sys/dev/i2c/pcf8563.c
diff -u src/sys/dev/i2c/pcf8563.c:1.15 src/sys/dev/i2c/pcf8563.c:1.15.4.1
--- src/sys/dev/i2c/pcf8563.c:1.15 Wed Jan 27 02:29:48 2021
+++ src/sys/dev/i2c/pcf8563.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pcf8563.c,v 1.15 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: pcf8563.c,v 1.15.4.1 2021/05/08 16:46:43 thorpej Exp $ */
/*
* Copyright (c) 2011 Jonathan A. Kollasch
@@ -32,7 +32,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcf8563.c,v 1.15 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcf8563.c,v 1.15.4.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,7 +123,8 @@ pcf8563rtc_attach(device_t parent, devic
}
#ifdef FDT
- fdtbus_todr_attach(self, ia->ia_cookie, &sc->sc_todr);
+ fdtbus_todr_attach(self, devhandle_to_of(device_handle(self)),
+ &sc->sc_todr);
#else
todr_attach(&sc->sc_todr);
#endif
Index: src/sys/dev/i2c/rkpmic.c
diff -u src/sys/dev/i2c/rkpmic.c:1.13 src/sys/dev/i2c/rkpmic.c:1.13.2.1
--- src/sys/dev/i2c/rkpmic.c:1.13 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/rkpmic.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rkpmic.c,v 1.13 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: rkpmic.c,v 1.13.2.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rkpmic.c,v 1.13 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rkpmic.c,v 1.13.2.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -472,7 +472,7 @@ rkpmic_attach(device_t parent, device_t
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
sc->sc_addr = ia->ia_addr;
- sc->sc_phandle = ia->ia_cookie;
+ sc->sc_phandle = devhandle_to_of(device_handle(self));
sc->sc_conf = entry->data;
memset(&sc->sc_todr, 0, sizeof(sc->sc_todr));
Index: src/sys/dev/i2c/sy8106a.c
diff -u src/sys/dev/i2c/sy8106a.c:1.8 src/sys/dev/i2c/sy8106a.c:1.8.4.1
--- src/sys/dev/i2c/sy8106a.c:1.8 Wed Jan 27 02:29:48 2021
+++ src/sys/dev/i2c/sy8106a.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sy8106a.c,v 1.8 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: sy8106a.c,v 1.8.4.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sy8106a.c,v 1.8 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sy8106a.c,v 1.8.4.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -202,7 +202,7 @@ sy8106a_attach(device_t parent, device_t
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
sc->sc_addr = ia->ia_addr;
- sc->sc_phandle = ia->ia_cookie;
+ sc->sc_phandle = devhandle_to_of(device_handle(self));
aprint_naive("\n");
aprint_normal(": Silergy SY8106A regulator\n");
Index: src/sys/dev/i2c/tcagpio.c
diff -u src/sys/dev/i2c/tcagpio.c:1.8 src/sys/dev/i2c/tcagpio.c:1.8.4.1
--- src/sys/dev/i2c/tcagpio.c:1.8 Wed Jan 27 02:29:48 2021
+++ src/sys/dev/i2c/tcagpio.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcagpio.c,v 1.8 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: tcagpio.c,v 1.8.4.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcagpio.c,v 1.8 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcagpio.c,v 1.8.4.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -263,7 +263,7 @@ tcagpio_attach(device_t parent, device_t
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
sc->sc_addr = ia->ia_addr;
- sc->sc_phandle = ia->ia_cookie;
+ sc->sc_phandle = devhandle_to_of(device_handle(self));
sc->sc_npins = TCA_PIN_COUNT;
aprint_naive("\n");
Index: src/sys/dev/i2c/tcakp.c
diff -u src/sys/dev/i2c/tcakp.c:1.16 src/sys/dev/i2c/tcakp.c:1.16.2.1
--- src/sys/dev/i2c/tcakp.c:1.16 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/tcakp.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcakp.c,v 1.16 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: tcakp.c,v 1.16.2.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_fdt.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcakp.c,v 1.16 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcakp.c,v 1.16.2.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -380,7 +380,7 @@ tcakp_attach(device_t parent, device_t s
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
sc->sc_addr = ia->ia_addr;
- sc->sc_phandle = ia->ia_cookie;
+ sc->sc_phandle = devhandle_to_of(device_handle(self));
aprint_naive("\n");
aprint_normal(": TCA8418\n");
Index: src/sys/dev/i2c/tps65217pmic.c
diff -u src/sys/dev/i2c/tps65217pmic.c:1.19 src/sys/dev/i2c/tps65217pmic.c:1.19.2.1
--- src/sys/dev/i2c/tps65217pmic.c:1.19 Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/tps65217pmic.c Sat May 8 16:46:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tps65217pmic.c,v 1.19 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: tps65217pmic.c,v 1.19.2.1 2021/05/08 16:46:43 thorpej Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include "opt_fdt.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tps65217pmic.c,v 1.19 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tps65217pmic.c,v 1.19.2.1 2021/05/08 16:46:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -335,7 +335,7 @@ tps65217pmic_attach(device_t parent, dev
sc->sc_dev = self;
sc->sc_addr = ia->ia_addr;
- sc->sc_phandle = ia->ia_cookie;
+ sc->sc_phandle = devhandle_to_of(device_handle(self));
sc->sc_tag = ia->ia_tag;
dict = device_properties(self);
