Module Name: src
Committed By: jmcneill
Date: Sun Nov 7 17:12:55 UTC 2021
Modified Files:
src/sys/arch/arm/ti: if_cpsw.c
Log Message:
ti: cpsw: adapt to dts-5.15 bindings
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/ti/if_cpsw.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/ti/if_cpsw.c
diff -u src/sys/arch/arm/ti/if_cpsw.c:1.14 src/sys/arch/arm/ti/if_cpsw.c:1.15
--- src/sys/arch/arm/ti/if_cpsw.c:1.14 Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/ti/if_cpsw.c Sun Nov 7 17:12:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cpsw.c,v 1.14 2021/01/27 03:10:20 thorpej Exp $ */
+/* $NetBSD: if_cpsw.c,v 1.15 2021/11/07 17:12:55 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.14 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.15 2021/11/07 17:12:55 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -310,6 +310,7 @@ cpsw_rxdesc_paddr(struct cpsw_softc * co
}
static const struct device_compatible_entry compat_data[] = {
+ { .compat = "ti,am335x-cpsw-switch" },
{ .compat = "ti,am335x-cpsw" },
{ .compat = "ti,cpsw" },
DEVICE_COMPAT_EOL
@@ -417,7 +418,13 @@ cpsw_attach(device_t parent, device_t se
macaddr = NULL;
slave = of_find_firstchild_byname(phandle, "slave");
- if (slave > 0) {
+ if (slave == -1) {
+ slave = of_find_firstchild_byname(phandle, "ethernet-ports");
+ if (slave != -1) {
+ slave = of_find_firstchild_byname(slave, "port");
+ }
+ }
+ if (slave != -1) {
macaddr = fdtbus_get_prop(slave, "mac-address", &len);
if (len != ETHER_ADDR_LEN)
macaddr = NULL;
