Module Name: src Committed By: jmcneill Date: Sun Nov 7 19:21:33 UTC 2021
Modified Files: src/sys/arch/arm/amlogic: meson_dwmac.c src/sys/arch/arm/rockchip: rk_gmac.c src/sys/arch/arm/sunxi: sunxi_emac.c sunxi_gmac.c Log Message: Handle RGMII variants. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/amlogic/meson_dwmac.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/rockchip/rk_gmac.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/sunxi/sunxi_emac.c cvs rdiff -u -r1.9 -r1.10 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/amlogic/meson_dwmac.c diff -u src/sys/arch/arm/amlogic/meson_dwmac.c:1.11 src/sys/arch/arm/amlogic/meson_dwmac.c:1.12 --- src/sys/arch/arm/amlogic/meson_dwmac.c:1.11 Wed Jan 27 03:10:18 2021 +++ src/sys/arch/arm/amlogic/meson_dwmac.c Sun Nov 7 19:21:32 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: meson_dwmac.c,v 1.11 2021/01/27 03:10:18 thorpej Exp $ */ +/* $NetBSD: meson_dwmac.c,v 1.12 2021/11/07 19:21:32 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca> @@ -28,7 +28,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.11 2021/01/27 03:10:18 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.12 2021/11/07 19:21:32 jmcneill Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -207,7 +207,7 @@ meson_dwmac_attach(device_t parent, devi phandle_phy = phandle; } - if (strcmp(phy_mode, "rgmii") == 0) { + if (strncmp(phy_mode, "rgmii", 5) == 0) { meson_dwmac_set_mode_rgmii(phandle, sc->sc_bst, prgeth_bsh, clk_in[0]); } else if (strcmp(phy_mode, "rmii") == 0) { meson_dwmac_set_mode_rmii(phandle, sc->sc_bst, prgeth_bsh); Index: src/sys/arch/arm/rockchip/rk_gmac.c diff -u src/sys/arch/arm/rockchip/rk_gmac.c:1.19 src/sys/arch/arm/rockchip/rk_gmac.c:1.20 --- src/sys/arch/arm/rockchip/rk_gmac.c:1.19 Wed Jan 27 03:10:19 2021 +++ src/sys/arch/arm/rockchip/rk_gmac.c Sun Nov 7 19:21:33 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: rk_gmac.c,v 1.19 2021/01/27 03:10:19 thorpej Exp $ */ +/* $NetBSD: rk_gmac.c,v 1.20 2021/11/07 19:21:33 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca> @@ -28,7 +28,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.19 2021/01/27 03:10:19 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.20 2021/11/07 19:21:33 jmcneill Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -416,7 +416,7 @@ rk_gmac_attach(device_t parent, device_t switch (rk_sc->sc_type) { case GMAC_RK3328: - if (strcmp(phy_mode, "rgmii") == 0) { + if (strncmp(phy_mode, "rgmii", 5) == 0) { rk3328_gmac_set_mode_rgmii(sc, tx_delay, rx_delay, set_delay); @@ -427,7 +427,7 @@ rk_gmac_attach(device_t parent, device_t } break; case GMAC_RK3399: - if (strcmp(phy_mode, "rgmii") == 0) { + if (strncmp(phy_mode, "rgmii", 5) == 0) { rk3399_gmac_set_mode_rgmii(sc, tx_delay, rx_delay, set_delay); Index: src/sys/arch/arm/sunxi/sunxi_emac.c diff -u src/sys/arch/arm/sunxi/sunxi_emac.c:1.33 src/sys/arch/arm/sunxi/sunxi_emac.c:1.34 --- src/sys/arch/arm/sunxi/sunxi_emac.c:1.33 Wed Jan 27 03:10:20 2021 +++ src/sys/arch/arm/sunxi/sunxi_emac.c Sun Nov 7 19:21:33 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_emac.c,v 1.33 2021/01/27 03:10:20 thorpej Exp $ */ +/* $NetBSD: sunxi_emac.c,v 1.34 2021/11/07 19:21:33 jmcneill Exp $ */ /*- * Copyright (c) 2016-2017 Jared McNeill <jmcne...@invisible.ca> @@ -33,7 +33,7 @@ #include "opt_net_mpsafe.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.33 2021/01/27 03:10:20 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.34 2021/11/07 19:21:33 jmcneill Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -987,7 +987,7 @@ sunxi_emac_setup_phy(struct sunxi_emac_s reg = syscon_read_4(sc->syscon, EMAC_CLK_REG); reg &= ~(EMAC_CLK_PIT | EMAC_CLK_SRC | EMAC_CLK_RMII_EN); - if (strcmp(phy_type, "rgmii") == 0) + if (strncmp(phy_type, "rgmii", 5) == 0) reg |= EMAC_CLK_PIT_RGMII | EMAC_CLK_SRC_RGMII; else if (strcmp(phy_type, "rmii") == 0) reg |= EMAC_CLK_RMII_EN; Index: src/sys/arch/arm/sunxi/sunxi_gmac.c diff -u src/sys/arch/arm/sunxi/sunxi_gmac.c:1.9 src/sys/arch/arm/sunxi/sunxi_gmac.c:1.10 --- src/sys/arch/arm/sunxi/sunxi_gmac.c:1.9 Wed Jan 27 03:10:20 2021 +++ src/sys/arch/arm/sunxi/sunxi_gmac.c Sun Nov 7 19:21:33 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_gmac.c,v 1.9 2021/01/27 03:10:20 thorpej Exp $ */ +/* $NetBSD: sunxi_gmac.c,v 1.10 2021/11/07 19:21:33 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca> @@ -28,7 +28,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunxi_gmac.c,v 1.9 2021/01/27 03:10:20 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunxi_gmac.c,v 1.10 2021/11/07 19:21:33 jmcneill Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -177,7 +177,7 @@ sunxi_gmac_attach(device_t parent, devic aprint_error(": failed to set TX clock rate (MII)\n"); return; } - } else if (strcmp(phy_mode, "rgmii") == 0) { + } else if (strncmp(phy_mode, "rgmii", 5) == 0) { if (clk_set_rate(clk_gmac_tx, GMAC_TX_RATE_RGMII) != 0) { aprint_error(": failed to set TX clock rate (RGMII)\n"); return;