On Tue, 31 Oct 2023 00:25:46 -0500 Samuel Holland <[email protected]> wrote:
Hi, > DM_GPIO is always enable in U-Boot proper for ARCH_SUNXI, and this > driver is never enabled in SPL, so the condition is always true. Yes indeed, the u-boot.bin binaries of all sunxi boards are identical with and without this patch. > Signed-off-by: Samuel Holland <[email protected]> Reviewed-by: Andre Przywara <[email protected]> Who is going to take this, does this go via some network tree? Thanks, Andre > --- > > drivers/net/sun8i_emac.c | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c > index 4ba9ee1529e..a12f7e32e8f 100644 > --- a/drivers/net/sun8i_emac.c > +++ b/drivers/net/sun8i_emac.c > @@ -168,9 +168,7 @@ struct emac_eth_dev { > struct clk ephy_clk; > struct reset_ctl tx_rst; > struct reset_ctl ephy_rst; > -#if CONFIG_IS_ENABLED(DM_GPIO) > struct gpio_desc reset_gpio; > -#endif > struct udevice *phy_reg; > }; > > @@ -617,7 +615,6 @@ err_tx_clk: > return ret; > } > > -#if CONFIG_IS_ENABLED(DM_GPIO) > static int sun8i_mdio_reset(struct mii_dev *bus) > { > struct udevice *dev = bus->priv; > @@ -649,7 +646,6 @@ static int sun8i_mdio_reset(struct mii_dev *bus) > > return 0; > } > -#endif > > static int sun8i_mdio_init(const char *name, struct udevice *priv) > { > @@ -664,9 +660,7 @@ static int sun8i_mdio_init(const char *name, struct > udevice *priv) > bus->write = sun8i_mdio_write; > snprintf(bus->name, sizeof(bus->name), name); > bus->priv = (void *)priv; > -#if CONFIG_IS_ENABLED(DM_GPIO) > bus->reset = sun8i_mdio_reset; > -#endif > > return mdio_register(bus); > } > @@ -783,9 +777,7 @@ static int sun8i_emac_eth_of_to_plat(struct udevice *dev) > const fdt32_t *reg; > int node = dev_of_offset(dev); > int offset = 0; > -#if CONFIG_IS_ENABLED(DM_GPIO) > int reset_flags = GPIOD_IS_OUT; > -#endif > int ret; > > pdata->iobase = dev_read_addr(dev); > @@ -872,7 +864,6 @@ static int sun8i_emac_eth_of_to_plat(struct udevice *dev) > printf("%s: Invalid RX delay value %d\n", __func__, > sun8i_pdata->rx_delay_ps); > > -#if CONFIG_IS_ENABLED(DM_GPIO) > if (fdtdec_get_bool(gd->fdt_blob, dev_of_offset(dev), > "snps,reset-active-low")) > reset_flags |= GPIOD_ACTIVE_LOW; > @@ -887,7 +878,6 @@ static int sun8i_emac_eth_of_to_plat(struct udevice *dev) > } else if (ret == -ENOENT) { > ret = 0; > } > -#endif > > return 0; > }
