Module Name: src
Committed By: martin
Date: Sat Feb 23 17:18:39 UTC 2019
Modified Files:
src/sys/arch/arm/altera: cycv_gmac.c
src/sys/arch/arm/amlogic: meson_dwmac.c
src/sys/arch/arm/rockchip: rk_gmac.c
src/sys/arch/arm/sunxi: sunxi_gmac.c
Log Message:
Adjust all callers of dwc_gmac_attach, pass MII_PHY_ANY for now.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/altera/cycv_gmac.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/amlogic/meson_dwmac.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/rockchip/rk_gmac.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/sunxi/sunxi_gmac.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/altera/cycv_gmac.c
diff -u src/sys/arch/arm/altera/cycv_gmac.c:1.1 src/sys/arch/arm/altera/cycv_gmac.c:1.2
--- src/sys/arch/arm/altera/cycv_gmac.c:1.1 Wed Sep 19 17:31:38 2018
+++ src/sys/arch/arm/altera/cycv_gmac.c Sat Feb 23 17:18:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cycv_gmac.c,v 1.1 2018/09/19 17:31:38 aymeric Exp $ */
+/* $NetBSD: cycv_gmac.c,v 1.2 2019/02/23 17:18:38 martin Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cycv_gmac.c,v 1.1 2018/09/19 17:31:38 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cycv_gmac.c,v 1.2 2019/02/23 17:18:38 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -136,7 +136,7 @@ cycv_gmac_attach(device_t parent, device
}
aprint_normal_dev(self, "interrupting on %s\n", intrstr);
- dwc_gmac_attach(sc, GMAC_MII_CLK_150_250M_DIV102);
+ dwc_gmac_attach(sc, MII_PHY_ANY, GMAC_MII_CLK_150_250M_DIV102);
}
CFATTACH_DECL_NEW(cycv_gmac, sizeof(struct dwc_gmac_softc),
Index: src/sys/arch/arm/amlogic/meson_dwmac.c
diff -u src/sys/arch/arm/amlogic/meson_dwmac.c:1.1 src/sys/arch/arm/amlogic/meson_dwmac.c:1.2
--- src/sys/arch/arm/amlogic/meson_dwmac.c:1.1 Sat Jan 19 20:56:03 2019
+++ src/sys/arch/arm/amlogic/meson_dwmac.c Sat Feb 23 17:18:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_dwmac.c,v 1.1 2019/01/19 20:56:03 jmcneill Exp $ */
+/* $NetBSD: meson_dwmac.c,v 1.2 2019/02/23 17:18:38 martin Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.1 2019/01/19 20:56:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.2 2019/02/23 17:18:38 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -187,7 +187,7 @@ meson_dwmac_attach(device_t parent, devi
if (meson_dwmac_reset(phandle) != 0)
aprint_error_dev(self, "PHY reset failed\n");
- dwc_gmac_attach(sc, GMAC_MII_CLK_100_150M_DIV62);
+ dwc_gmac_attach(sc, MII_PHY_ANY, GMAC_MII_CLK_100_150M_DIV62);
}
CFATTACH_DECL_NEW(meson_dwmac, sizeof(struct dwc_gmac_softc),
Index: src/sys/arch/arm/rockchip/rk_gmac.c
diff -u src/sys/arch/arm/rockchip/rk_gmac.c:1.8 src/sys/arch/arm/rockchip/rk_gmac.c:1.9
--- src/sys/arch/arm/rockchip/rk_gmac.c:1.8 Sun Aug 12 16:48:05 2018
+++ src/sys/arch/arm/rockchip/rk_gmac.c Sat Feb 23 17:18:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_gmac.c,v 1.8 2018/08/12 16:48:05 jmcneill Exp $ */
+/* $NetBSD: rk_gmac.c,v 1.9 2019/02/23 17:18:38 martin Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.8 2018/08/12 16:48:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.9 2019/02/23 17:18:38 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -408,7 +408,7 @@ rk_gmac_attach(device_t parent, device_t
aprint_naive("\n");
aprint_normal(": GMAC\n");
- if (dwc_gmac_attach(sc, GMAC_MII_CLK_150_250M_DIV102) != 0)
+ if (dwc_gmac_attach(sc, MII_PHY_ANY, GMAC_MII_CLK_150_250M_DIV102) != 0)
return;
if (fdtbus_intr_establish(phandle, 0, IPL_NET, 0, rk_gmac_intr, sc) == NULL) {
Index: src/sys/arch/arm/sunxi/sunxi_gmac.c
diff -u src/sys/arch/arm/sunxi/sunxi_gmac.c:1.2 src/sys/arch/arm/sunxi/sunxi_gmac.c:1.3
--- src/sys/arch/arm/sunxi/sunxi_gmac.c:1.2 Sat Oct 7 19:42:45 2017
+++ src/sys/arch/arm/sunxi/sunxi_gmac.c Sat Feb 23 17:18:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_gmac.c,v 1.2 2017/10/07 19:42:45 jmcneill Exp $ */
+/* $NetBSD: sunxi_gmac.c,v 1.3 2019/02/23 17:18:38 martin Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_gmac.c,v 1.2 2017/10/07 19:42:45 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_gmac.c,v 1.3 2019/02/23 17:18:38 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -182,7 +182,7 @@ sunxi_gmac_attach(device_t parent, devic
if (sunxi_gmac_reset(phandle) != 0)
aprint_error_dev(self, "PHY reset failed\n");
- dwc_gmac_attach(sc, GMAC_MII_CLK_150_250M_DIV102);
+ dwc_gmac_attach(sc, MII_PHY_ANY, GMAC_MII_CLK_150_250M_DIV102);
}
CFATTACH_DECL_NEW(sunxi_gmac, sizeof(struct dwc_gmac_softc),
