Module Name: src
Committed By: jmcneill
Date: Sun Jul 1 21:18:00 UTC 2018
Modified Files:
src/sys/arch/arm/nvidia: tegra_i2c.c
Log Message:
Use fdtbus_attach_i2cbus
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/nvidia/tegra_i2c.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/nvidia/tegra_i2c.c
diff -u src/sys/arch/arm/nvidia/tegra_i2c.c:1.17 src/sys/arch/arm/nvidia/tegra_i2c.c:1.18
--- src/sys/arch/arm/nvidia/tegra_i2c.c:1.17 Wed May 9 02:53:00 2018
+++ src/sys/arch/arm/nvidia/tegra_i2c.c Sun Jul 1 21:18:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_i2c.c,v 1.17 2018/05/09 02:53:00 thorpej Exp $ */
+/* $NetBSD: tegra_i2c.c,v 1.18 2018/07/01 21:18:00 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.17 2018/05/09 02:53:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.18 2018/07/01 21:18:00 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -65,7 +65,6 @@ struct tegra_i2c_softc {
struct i2c_controller sc_ic;
kmutex_t sc_lock;
kcondvar_t sc_cv;
- device_t sc_i2cdev;
};
static void tegra_i2c_init(struct tegra_i2c_softc *);
@@ -112,12 +111,9 @@ tegra_i2c_attach(device_t parent, device
struct tegra_i2c_softc * const sc = device_private(self);
struct fdt_attach_args * const faa = aux;
const int phandle = faa->faa_phandle;
- struct i2cbus_attach_args iba;
- prop_dictionary_t devs;
char intrstr[128];
bus_addr_t addr;
bus_size_t size;
- u_int address_cells;
int error;
if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
@@ -189,21 +185,7 @@ tegra_i2c_attach(device_t parent, device
fdtbus_register_i2c_controller(self, phandle, &tegra_i2c_funcs);
- devs = prop_dictionary_create();
-
- if (of_getprop_uint32(phandle, "#address-cells", &address_cells))
- address_cells = 1;
-
- of_enter_i2c_devs(devs, faa->faa_phandle, address_cells * 4, 0);
-
- memset(&iba, 0, sizeof(iba));
- iba.iba_tag = &sc->sc_ic;
- iba.iba_child_devices = prop_dictionary_get(devs, "i2c-child-devices");
- if (iba.iba_child_devices != NULL)
- prop_object_retain(iba.iba_child_devices);
- prop_object_release(devs);
-
- sc->sc_i2cdev = config_found_ia(self, "i2cbus", &iba, iicbus_print);
+ fdtbus_attach_i2cbus(self, phandle, &sc->sc_ic, iicbus_print);
}
static i2c_tag_t
