git: d46fd9e855a2 - main - if_cgem: Make ext_resources non-optional

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=d46fd9e855a2212f59ae35e84162d2d1a44f2035

commit d46fd9e855a2212f59ae35e84162d2d1a44f2035
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-01-11 09:42:34 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2022-02-21 16:28:48 +0000

    if_cgem: Make ext_resources non-optional
    
    EXT_RESOURCES have been introduced in 12-CURRENT and all supported
    releases have it enabled in their kernel config.
    
    MFC after:      1 month
    Differential Revision:  https://reviews.freebsd.org/D33825
---
 sys/dev/cadence/if_cgem.c | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c
index 6001c5ba74a5..6b9d5a090aff 100644
--- a/sys/dev/cadence/if_cgem.c
+++ b/sys/dev/cadence/if_cgem.c
@@ -77,9 +77,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
-#ifdef EXT_RESOURCES
 #include <dev/extres/clk/clk.h>
-#endif
 
 #if BUS_SPACE_MAXADDR > BUS_SPACE_MAXADDR_32BIT
 #define CGEM64
@@ -130,11 +128,7 @@ struct cgem_softc {
 	struct callout		tick_ch;
 	uint32_t		net_ctl_shadow;
 	uint32_t		net_cfg_shadow;
-#ifdef EXT_RESOURCES
 	clk_t			ref_clk;
-#else
-	int			ref_clk_num;
-#endif
 	int			neednullqs;
 
 	bus_dma_tag_t		desc_dma_tag;
@@ -1497,7 +1491,6 @@ cgem_mediachange(struct cgem_softc *sc,	struct mii_data *mii)
 
 	WR4(sc, CGEM_NET_CFG, sc->net_cfg_shadow);
 
-#ifdef EXT_RESOURCES
 	if (sc->ref_clk != NULL) {
 		CGEM_UNLOCK(sc);
 		if (clk_set_freq(sc->ref_clk, ref_clk_freq, 0))
@@ -1505,13 +1498,6 @@ cgem_mediachange(struct cgem_softc *sc,	struct mii_data *mii)
 			    ref_clk_freq);
 		CGEM_LOCK(sc);
 	}
-#else
-	/* Set the reference clock if necessary. */
-	if (cgem_set_ref_clk(sc->ref_clk_num, ref_clk_freq))
-		device_printf(sc->dev,
-		    "cgem_mediachange: could not set ref clk%d to %d.\n",
-		    sc->ref_clk_num, ref_clk_freq);
-#endif
 
 	sc->mii_media_active = mii->mii_media_active;
 }
@@ -1741,10 +1727,6 @@ cgem_attach(device_t dev)
 	int rid, err;
 	u_char eaddr[ETHER_ADDR_LEN];
 	int hwtype;
-#ifndef EXT_RESOURCES
-	phandle_t node;
-	pcell_t cell;
-#endif
 
 	sc->dev = dev;
 	CGEM_LOCK_INIT(sc);
@@ -1756,7 +1738,6 @@ cgem_attach(device_t dev)
 	if (hwtype == HWTYPE_ZYNQ)
 		sc->rxhangwar = 1;
 
-#ifdef EXT_RESOURCES
 	if (hwtype == HWTYPE_ZYNQ || hwtype == HWTYPE_ZYNQMP) {
 		if (clk_get_by_ofw_name(dev, 0, "tx_clk", &sc->ref_clk) != 0)
 			device_printf(dev,
@@ -1770,13 +1751,6 @@ cgem_attach(device_t dev)
 		else if (clk_enable(sc->ref_clk) != 0)
 			device_printf(dev, "could not enable clock.\n");
 	}
-#else
-	/* Get reference clock number and base divider from fdt. */
-	node = ofw_bus_get_node(dev);
-	sc->ref_clk_num = 0;
-	if (OF_getprop(node, "ref-clock-num", &cell, sizeof(cell)) > 0)
-		sc->ref_clk_num = fdt32_to_cpu(cell);
-#endif
 
 	/* Get memory resource. */
 	rid = 0;
@@ -1939,12 +1913,10 @@ cgem_detach(device_t dev)
 		sc->mbuf_dma_tag = NULL;
 	}
 
-#ifdef EXT_RESOURCES
 	if (sc->ref_clk != NULL) {
 		clk_release(sc->ref_clk);
 		sc->ref_clk = NULL;
 	}
-#endif
 
 	bus_generic_detach(dev);