Module Name: src
Committed By: thorpej
Date: Wed May 19 03:14:25 UTC 2021
Modified Files:
src/sys/arch/arm/broadcom [thorpej-i2c-spi-conf]: bcm2835_bsc_fdt.c
src/sys/arch/arm/nvidia [thorpej-i2c-spi-conf]: tegra_i2c.c
src/sys/arch/arm/rockchip [thorpej-i2c-spi-conf]: rk_i2c.c
src/sys/arch/arm/samsung [thorpej-i2c-spi-conf]: exynos_i2c.c
src/sys/arch/arm/sociox [thorpej-i2c-spi-conf]: sni_i2c.c
src/sys/arch/arm/sunxi [thorpej-i2c-spi-conf]: sunxi_rsb.c sunxi_twi.c
src/sys/arch/arm/ti [thorpej-i2c-spi-conf]: ti_iic.c
src/sys/dev/fdt [thorpej-i2c-spi-conf]: dwiic_fdt.c fdt_i2c.c fdtvar.h
src/sys/dev/i2c [thorpej-i2c-spi-conf]: motoi2c.c
Log Message:
fdtbus_attach_i2cbus() is no longer anything other than a wrapper around
config_found(); just get rid of it and make its callers look like all of
the other I2C controller drivers.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/arch/arm/broadcom/bcm2835_bsc_fdt.c
cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/arch/arm/nvidia/tegra_i2c.c
cvs rdiff -u -r1.10 -r1.10.4.1 src/sys/arch/arm/rockchip/rk_i2c.c
cvs rdiff -u -r1.22 -r1.22.4.1 src/sys/arch/arm/samsung/exynos_i2c.c
cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/arch/arm/sociox/sni_i2c.c
cvs rdiff -u -r1.14 -r1.14.4.1 src/sys/arch/arm/sunxi/sunxi_rsb.c
cvs rdiff -u -r1.17 -r1.17.4.1 src/sys/arch/arm/sunxi/sunxi_twi.c
cvs rdiff -u -r1.13 -r1.13.4.1 src/sys/arch/arm/ti/ti_iic.c
cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/dev/fdt/dwiic_fdt.c
cvs rdiff -u -r1.10.2.1 -r1.10.2.2 src/sys/dev/fdt/fdt_i2c.c
cvs rdiff -u -r1.70.2.1 -r1.70.2.2 src/sys/dev/fdt/fdtvar.h
cvs rdiff -u -r1.11.2.1 -r1.11.2.2 src/sys/dev/i2c/motoi2c.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/arch/arm/broadcom/bcm2835_bsc_fdt.c
diff -u src/sys/arch/arm/broadcom/bcm2835_bsc_fdt.c:1.6 src/sys/arch/arm/broadcom/bcm2835_bsc_fdt.c:1.6.4.1
--- src/sys/arch/arm/broadcom/bcm2835_bsc_fdt.c:1.6 Fri Jan 29 14:11:14 2021
+++ src/sys/arch/arm/broadcom/bcm2835_bsc_fdt.c Wed May 19 03:14:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_bsc_fdt.c,v 1.6 2021/01/29 14:11:14 skrll Exp $ */
+/* $NetBSD: bcm2835_bsc_fdt.c,v 1.6.4.1 2021/05/19 03:14:24 thorpej Exp $ */
/*
* Copyright (c) 2019 Jason R. Thorpe
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_fdt.c,v 1.6 2021/01/29 14:11:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_fdt.c,v 1.6.4.1 2021/05/19 03:14:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -135,5 +135,10 @@ bsciic_fdt_attach(device_t parent, devic
fdtbus_register_i2c_controller(&sc->sc_i2c, phandle);
- fdtbus_attach_i2cbus(self, phandle, &sc->sc_i2c, iicbus_print);
+ struct i2cbus_attach_args iba = {
+ .iba_tag = &sc->sc_i2c,
+ };
+ config_found(self, &iba, iicbus_print,
+ CFARG_DEVHANDLE, device_handle(self),
+ CFARG_EOL);
}
Index: src/sys/arch/arm/nvidia/tegra_i2c.c
diff -u src/sys/arch/arm/nvidia/tegra_i2c.c:1.26 src/sys/arch/arm/nvidia/tegra_i2c.c:1.26.4.1
--- src/sys/arch/arm/nvidia/tegra_i2c.c:1.26 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/nvidia/tegra_i2c.c Wed May 19 03:14:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_i2c.c,v 1.26 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: tegra_i2c.c,v 1.26.4.1 2021/05/19 03:14:24 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.26 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.26.4.1 2021/05/19 03:14:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -180,7 +180,12 @@ tegra_i2c_attach(device_t parent, device
fdtbus_register_i2c_controller(&sc->sc_ic, phandle);
- fdtbus_attach_i2cbus(self, phandle, &sc->sc_ic, iicbus_print);
+ struct i2cbus_attach_args iba = {
+ .iba_tag = &sc->sc_ic,
+ };
+ config_found(self, &iba, iicbus_print,
+ CFARG_DEVHANDLE, device_handle(self),
+ CFARG_EOL);
}
static void
Index: src/sys/arch/arm/rockchip/rk_i2c.c
diff -u src/sys/arch/arm/rockchip/rk_i2c.c:1.10 src/sys/arch/arm/rockchip/rk_i2c.c:1.10.4.1
--- src/sys/arch/arm/rockchip/rk_i2c.c:1.10 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/rockchip/rk_i2c.c Wed May 19 03:14:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_i2c.c,v 1.10 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: rk_i2c.c,v 1.10.4.1 2021/05/19 03:14:24 thorpej Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_i2c.c,v 1.10 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_i2c.c,v 1.10.4.1 2021/05/19 03:14:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -418,7 +418,12 @@ rk_i2c_attach(device_t parent, device_t
fdtbus_register_i2c_controller(&sc->sc_ic, phandle);
- fdtbus_attach_i2cbus(self, phandle, &sc->sc_ic, iicbus_print);
+ struct i2cbus_attach_args iba = {
+ .iba_tag = &sc->sc_ic,
+ };
+ config_found(self, &iba, iicbus_print,
+ CFARG_DEVHANDLE, device_handle(self),
+ CFARG_EOL);
}
CFATTACH_DECL_NEW(rk_i2c, sizeof(struct rk_i2c_softc),
Index: src/sys/arch/arm/samsung/exynos_i2c.c
diff -u src/sys/arch/arm/samsung/exynos_i2c.c:1.22 src/sys/arch/arm/samsung/exynos_i2c.c:1.22.4.1
--- src/sys/arch/arm/samsung/exynos_i2c.c:1.22 Sun Mar 14 08:16:57 2021
+++ src/sys/arch/arm/samsung/exynos_i2c.c Wed May 19 03:14:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_i2c.c,v 1.22 2021/03/14 08:16:57 skrll Exp $ */
+/* $NetBSD: exynos_i2c.c,v 1.22.4.1 2021/05/19 03:14:24 thorpej Exp $ */
/*
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
#include "opt_arm_debug.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.22 2021/03/14 08:16:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.22.4.1 2021/05/19 03:14:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -178,7 +178,12 @@ exynos_i2c_attach(device_t parent, devic
fdtbus_register_i2c_controller(&sc->sc_ic, phandle);
- fdtbus_attach_i2cbus(self, phandle, &sc->sc_ic, iicbus_print);
+ struct i2cbus_attach_args iba = {
+ .iba_tag = &sc->sc_ic,
+ };
+ config_found(self, &iba, iicbus_print,
+ CFARG_DEVHANDLE, device_handle(self),
+ CFARG_EOL);
}
static int
Index: src/sys/arch/arm/sociox/sni_i2c.c
diff -u src/sys/arch/arm/sociox/sni_i2c.c:1.11 src/sys/arch/arm/sociox/sni_i2c.c:1.11.2.1
--- src/sys/arch/arm/sociox/sni_i2c.c:1.11 Sat Apr 24 23:36:28 2021
+++ src/sys/arch/arm/sociox/sni_i2c.c Wed May 19 03:14:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sni_i2c.c,v 1.11 2021/04/24 23:36:28 thorpej Exp $ */
+/* $NetBSD: sni_i2c.c,v 1.11.2.1 2021/05/19 03:14:24 thorpej Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sni_i2c.c,v 1.11 2021/04/24 23:36:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sni_i2c.c,v 1.11.2.1 2021/05/19 03:14:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -148,7 +148,12 @@ sniiic_fdt_attach(device_t parent, devic
fdtbus_register_i2c_controller(&sc->sc_ic, phandle);
#if 0
- fdtbus_attach_i2cbus(self, phandle, &sc->sc_ic, iicbus_print);
+ struct i2cbus_attach_args iba = {
+ .iba_tag = &sc->sc_i2c,
+ };
+ config_found(self, &iba, iicbus_print,
+ CFARG_DEVHANDLE, device_handle(self),
+ CFARG_EOL);
#endif
return;
fail:
Index: src/sys/arch/arm/sunxi/sunxi_rsb.c
diff -u src/sys/arch/arm/sunxi/sunxi_rsb.c:1.14 src/sys/arch/arm/sunxi/sunxi_rsb.c:1.14.4.1
--- src/sys/arch/arm/sunxi/sunxi_rsb.c:1.14 Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/sunxi/sunxi_rsb.c Wed May 19 03:14:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_rsb.c,v 1.14 2021/01/27 03:10:20 thorpej Exp $ */
+/* $NetBSD: sunxi_rsb.c,v 1.14.4.1 2021/05/19 03:14:24 thorpej Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_rsb.c,v 1.14 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_rsb.c,v 1.14.4.1 2021/05/19 03:14:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -184,7 +184,12 @@ sunxi_rsb_attach(device_t parent, device
fdtbus_register_i2c_controller(&sc->sc_ic, phandle);
- fdtbus_attach_i2cbus(self, phandle, &sc->sc_ic, iicbus_print);
+ struct i2cbus_attach_args iba = {
+ .iba_tag = &sc->sc_ic,
+ };
+ config_found(self, &iba, iicbus_print,
+ CFARG_DEVHANDLE, device_handle(self),
+ CFARG_EOL);
}
static int
Index: src/sys/arch/arm/sunxi/sunxi_twi.c
diff -u src/sys/arch/arm/sunxi/sunxi_twi.c:1.17 src/sys/arch/arm/sunxi/sunxi_twi.c:1.17.4.1
--- src/sys/arch/arm/sunxi/sunxi_twi.c:1.17 Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/sunxi/sunxi_twi.c Wed May 19 03:14:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_twi.c,v 1.17 2021/01/27 03:10:20 thorpej Exp $ */
+/* $NetBSD: sunxi_twi.c,v 1.17.4.1 2021/05/19 03:14:24 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_twi.c,v 1.17 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_twi.c,v 1.17.4.1 2021/05/19 03:14:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -185,5 +185,10 @@ sunxi_twi_attach(device_t parent, device
fdtbus_register_i2c_controller(&sc->sc_i2c, phandle);
- fdtbus_attach_i2cbus(self, phandle, &sc->sc_i2c, iicbus_print);
+ struct i2cbus_attach_args iba = {
+ .iba_tag = &sc->sc_i2c,
+ };
+ config_found(self, &iba, iicbus_print,
+ CFARG_DEVHANDLE, device_handle(self),
+ CFARG_EOL);
}
Index: src/sys/arch/arm/ti/ti_iic.c
diff -u src/sys/arch/arm/ti/ti_iic.c:1.13 src/sys/arch/arm/ti/ti_iic.c:1.13.4.1
--- src/sys/arch/arm/ti/ti_iic.c:1.13 Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/ti/ti_iic.c Wed May 19 03:14:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_iic.c,v 1.13 2021/01/27 03:10:20 thorpej Exp $ */
+/* $NetBSD: ti_iic.c,v 1.13.4.1 2021/05/19 03:14:24 thorpej Exp $ */
/*
* Copyright (c) 2013 Manuel Bouyer. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_iic.c,v 1.13 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_iic.c,v 1.13.4.1 2021/05/19 03:14:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -298,7 +298,12 @@ ti_iic_attach(device_t parent, device_t
fdtbus_register_i2c_controller(&sc->sc_ic, phandle);
- fdtbus_attach_i2cbus(self, phandle, &sc->sc_ic, iicbus_print);
+ struct i2cbus_attach_args iba = {
+ .iba_tag = &sc->sc_ic,
+ };
+ config_found(self, &iba, iicbus_print,
+ CFARG_DEVHANDLE, device_handle(self),
+ CFARG_EOL);
}
static int
Index: src/sys/dev/fdt/dwiic_fdt.c
diff -u src/sys/dev/fdt/dwiic_fdt.c:1.4 src/sys/dev/fdt/dwiic_fdt.c:1.4.4.1
--- src/sys/dev/fdt/dwiic_fdt.c:1.4 Wed Jan 27 03:10:21 2021
+++ src/sys/dev/fdt/dwiic_fdt.c Wed May 19 03:14:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic_fdt.c,v 1.4 2021/01/27 03:10:21 thorpej Exp $ */
+/* $NetBSD: dwiic_fdt.c,v 1.4.4.1 2021/05/19 03:14:25 thorpej Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwiic_fdt.c,v 1.4 2021/01/27 03:10:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic_fdt.c,v 1.4.4.1 2021/05/19 03:14:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,7 +111,12 @@ dwiic_fdt_attach(device_t parent, device
fdtbus_register_i2c_controller(&sc->sc_dwiic.sc_i2c_tag, phandle);
- fdtbus_attach_i2cbus(self, phandle, &sc->sc_dwiic.sc_i2c_tag, iicbus_print);
+ struct i2cbus_attach_args iba = {
+ .iba_tag = &sc->sc_dwiic.sc_i2c_tag,
+ };
+ config_found(self, &iba, iicbus_print,
+ CFARG_DEVHANDLE, device_handle(self),
+ CFARG_EOL);
out:
return;
Index: src/sys/dev/fdt/fdt_i2c.c
diff -u src/sys/dev/fdt/fdt_i2c.c:1.10.2.1 src/sys/dev/fdt/fdt_i2c.c:1.10.2.2
--- src/sys/dev/fdt/fdt_i2c.c:1.10.2.1 Sun Apr 25 22:20:08 2021
+++ src/sys/dev/fdt/fdt_i2c.c Wed May 19 03:14:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_i2c.c,v 1.10.2.1 2021/04/25 22:20:08 thorpej Exp $ */
+/* $NetBSD: fdt_i2c.c,v 1.10.2.2 2021/05/19 03:14:25 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_i2c.c,v 1.10.2.1 2021/04/25 22:20:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_i2c.c,v 1.10.2.2 2021/05/19 03:14:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -97,17 +97,3 @@ fdtbus_i2c_acquire(int phandle, const ch
return fdtbus_get_i2c_tag(i2c_phandle);
}
-
-device_t
-fdtbus_attach_i2cbus(device_t dev, int phandle, i2c_tag_t tag, cfprint_t print)
-{
- struct i2cbus_attach_args iba;
-
- memset(&iba, 0, sizeof(iba));
- iba.iba_tag = tag;
-
- return config_found(dev, &iba, print,
- CFARG_IATTR, "i2cbus",
- CFARG_DEVHANDLE, devhandle_from_of(phandle),
- CFARG_EOL);
-}
Index: src/sys/dev/fdt/fdtvar.h
diff -u src/sys/dev/fdt/fdtvar.h:1.70.2.1 src/sys/dev/fdt/fdtvar.h:1.70.2.2
--- src/sys/dev/fdt/fdtvar.h:1.70.2.1 Wed May 19 02:58:26 2021
+++ src/sys/dev/fdt/fdtvar.h Wed May 19 03:14:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtvar.h,v 1.70.2.1 2021/05/19 02:58:26 thorpej Exp $ */
+/* $NetBSD: fdtvar.h,v 1.70.2.2 2021/05/19 03:14:25 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -399,8 +399,6 @@ int fdtbus_todr_attach(device_t, int, t
void fdtbus_power_reset(void);
void fdtbus_power_poweroff(void);
-device_t fdtbus_attach_i2cbus(device_t, int, i2c_tag_t, cfprint_t);
-
bool fdtbus_init(const void *);
const void * fdtbus_get_data(void);
int fdtbus_phandle2offset(int);
Index: src/sys/dev/i2c/motoi2c.c
diff -u src/sys/dev/i2c/motoi2c.c:1.11.2.1 src/sys/dev/i2c/motoi2c.c:1.11.2.2
--- src/sys/dev/i2c/motoi2c.c:1.11.2.1 Sun Apr 25 22:02:59 2021
+++ src/sys/dev/i2c/motoi2c.c Wed May 19 03:14:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: motoi2c.c,v 1.11.2.1 2021/04/25 22:02:59 thorpej Exp $ */
+/* $NetBSD: motoi2c.c,v 1.11.2.2 2021/05/19 03:14:25 thorpej Exp $ */
/*-
* Copyright (c) 2007, 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motoi2c.c,v 1.11.2.1 2021/04/25 22:02:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motoi2c.c,v 1.11.2.2 2021/05/19 03:14:25 thorpej Exp $");
#if defined(__arm__) || defined(__aarch64__)
#include "opt_fdt.h"
@@ -129,9 +129,7 @@ motoi2c_attach_common(device_t self, str
#ifdef FDT
if (sc->sc_phandle != 0) {
fdtbus_register_i2c_controller(&sc->sc_i2c, sc->sc_phandle);
- fdtbus_attach_i2cbus(self, sc->sc_phandle, &sc->sc_i2c,
- iicbus_print);
- } else
+ }
#endif
config_found(self, &iba, iicbus_print,
CFARG_IATTR, "i2cbus",
