git: 54682ad8d9e3 - stable/12 - dwc: Use mii_fdt function
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 11 Aug 2022 18:23:20 UTC
The branch stable/12 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=54682ad8d9e34109ad0269489ce3a3d577e0525d
commit 54682ad8d9e34109ad0269489ce3a3d577e0525d
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-04-11 19:34:57 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2022-08-11 17:54:30 +0000
dwc: Use mii_fdt function
Use the helper function to get phy mode and configure dwc accordingly.
Reviewed by: ian
(cherry picked from commit f77d8d10115b0863cc3dfd6e1746c02847d6569d)
---
sys/dev/dwc/if_dwc.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c
index 934c19f8c419..1b0d5e97417f 100644
--- a/sys/dev/dwc/if_dwc.c
+++ b/sys/dev/dwc/if_dwc.c
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
#include <dev/mii/miivar.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
+#include <dev/mii/mii_fdt.h>
#ifdef EXT_RESOURCES
#include <dev/extres/clk/clk.h>
@@ -1434,7 +1435,6 @@ dwc_attach(device_t dev)
struct ifnet *ifp;
int error, i;
uint32_t reg;
- char *phy_mode;
phandle_t node;
sc = device_get_softc(dev);
@@ -1445,12 +1445,19 @@ dwc_attach(device_t dev)
sc->mactype = IF_DWC_MAC_TYPE(dev);
node = ofw_bus_get_node(dev);
- if (OF_getprop_alloc(node, "phy-mode", (void **)&phy_mode)) {
- if (strcmp(phy_mode, "rgmii") == 0)
+ switch (mii_fdt_get_contype(node)) {
+ case MII_CONTYPE_RGMII:
+ case MII_CONTYPE_RGMII_ID:
+ case MII_CONTYPE_RGMII_RXID:
+ case MII_CONTYPE_RGMII_TXID:
sc->phy_mode = PHY_MODE_RGMII;
- if (strcmp(phy_mode, "rmii") == 0)
+ break;
+ case MII_CONTYPE_RMII:
sc->phy_mode = PHY_MODE_RMII;
- OF_prop_free(phy_mode);
+ break;
+ default:
+ device_printf(dev, "Unsupported MII type\n");
+ return (ENXIO);
}
if (IF_DWC_INIT(dev) != 0)