[src/trunk]: src/sys/arch/arm/ti Get mac address from DT

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

details:   https://anonhg.NetBSD.org/src/rev/cf5610233f8a
branches:  trunk
changeset: 460552:cf5610233f8a
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Oct 27 23:25:38 2019 +0000

description:
Get mac address from DT

diffstat:

 sys/arch/arm/ti/if_cpsw.c |  23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diffs (64 lines):

diff -r 6dc61c863bca -r cf5610233f8a sys/arch/arm/ti/if_cpsw.c
--- a/sys/arch/arm/ti/if_cpsw.c Sun Oct 27 21:39:50 2019 +0000
+++ b/sys/arch/arm/ti/if_cpsw.c Sun Oct 27 23:25:38 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_cpsw.c,v 1.6 2019/05/29 06:17:27 msaitoh Exp $      */
+/*     $NetBSD: if_cpsw.c,v 1.7 2019/10/27 23:25:38 jmcneill Exp $     */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.6 2019/05/29 06:17:27 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.7 2019/10/27 23:25:38 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -398,14 +398,14 @@
 {
        struct fdt_attach_args * const faa = aux;
        struct cpsw_softc * const sc = device_private(self);
-       prop_dictionary_t dict = device_properties(self);
        struct ethercom * const ec = &sc->sc_ec;
        struct ifnet * const ifp = &ec->ec_if;
        struct mii_data * const mii = &sc->sc_mii;
        const int phandle = faa->faa_phandle;
+       const uint8_t *macaddr;
        bus_addr_t addr;
        bus_size_t size;
-       int error;
+       int error, slave, len;
        u_int i;
 
        KERNHIST_INIT(cpswhist, 4096);
@@ -423,8 +423,14 @@
        callout_init(&sc->sc_tick_ch, 0);
        callout_setfunc(&sc->sc_tick_ch, cpsw_tick, sc);
 
-       prop_data_t eaprop = prop_dictionary_get(dict, "mac-address");
-       if (eaprop == NULL) {
+       macaddr = NULL;
+       slave = of_find_firstchild_byname(phandle, "slave");
+       if (slave > 0) {
+               macaddr = fdtbus_get_prop(slave, "mac-address", &len);
+               if (len != ETHER_ADDR_LEN)
+                       macaddr = NULL;
+       }
+       if (macaddr == NULL) {
 #if 0
                /* grab mac_id0 from AM335x control module */
                uint32_t reg_lo, reg_hi;
@@ -461,10 +467,7 @@
 #endif
                }
        } else {
-               KASSERT(prop_object_type(eaprop) == PROP_TYPE_DATA);
-               KASSERT(prop_data_size(eaprop) == ETHER_ADDR_LEN);
-               memcpy(sc->sc_enaddr, prop_data_data_nocopy(eaprop),
-                   ETHER_ADDR_LEN);
+               memcpy(sc->sc_enaddr, macaddr, ETHER_ADDR_LEN);
        }
 
 #if 0