[src/trunk]: src/sys/arch/arm/samsung Correctly initialize i2cbus attach args.

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0a3e45c634c4
branches:  trunk
changeset: 354298:0a3e45c634c4
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Jun 11 00:54:26 2017 +0000

description:
Correctly initialize i2cbus attach args.

diffstat:

 sys/arch/arm/samsung/exynos_i2c.c |  22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r fd72cfc9032b -r 0a3e45c634c4 sys/arch/arm/samsung/exynos_i2c.c
--- a/sys/arch/arm/samsung/exynos_i2c.c Sun Jun 11 00:13:15 2017 +0000
+++ b/sys/arch/arm/samsung/exynos_i2c.c Sun Jun 11 00:54:26 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exynos_i2c.c,v 1.11 2016/02/14 19:54:20 chs Exp $ */
+/*     $NetBSD: exynos_i2c.c,v 1.12 2017/06/11 00:54:26 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -31,7 +31,7 @@
 #include "opt_arm_debug.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.11 2016/02/14 19:54:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.12 2017/06/11 00:54:26 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -138,7 +138,8 @@
        struct fdt_attach_args * const faa = aux;
        const int phandle = faa->faa_phandle;
        struct i2cbus_attach_args iba;
-
+       prop_dictionary_t devs;
+       uint32_t address_cells;
        char intrstr[128];
        bus_addr_t addr;
        bus_size_t size;
@@ -187,7 +188,22 @@
        sc->sc_ic.ic_read_byte   = exynos_i2c_read_byte;
        sc->sc_ic.ic_write_byte  = exynos_i2c_write_byte;
 
+       fdtbus_register_i2c_controller(self, phandle, &exynos_i2c_funcs);
+
+       devs = prop_dictionary_create();
+       if (of_getprop_uint32(phandle, "#address-cells", &address_cells))
+               address_cells = 1;
+       of_enter_i2c_devs(devs, 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);
+       else
+               iba.iba_child_devices = prop_array_create();
+       prop_object_release(devs);
+
        sc->sc_i2cdev = config_found_ia(self, "i2cbus", &iba, iicbus_print);
 }