diff --git a/devices/stmmac/dwmac1000-6.12-ethercat.h b/devices/stmmac/dwmac1000-6.12-ethercat.h index c7b4e3f6..5e10c94a 100644 --- a/devices/stmmac/dwmac1000-6.12-ethercat.h +++ b/devices/stmmac/dwmac1000-6.12-ethercat.h @@ -329,5 +329,5 @@ enum rtc_control { #define GMAC_MMC_RX_CSUM_OFFLOAD 0x208 #define GMAC_EXTHASH_BASE 0x500 -extern const struct stmmac_dma_ops dwmac1000_dma_ops; +extern const struct stmmac_dma_ops ec_dwmac1000_dma_ops; #endif /* __DWMAC1000_H__ */ diff --git a/devices/stmmac/dwmac1000_dma-6.12-ethercat.c b/devices/stmmac/dwmac1000_dma-6.12-ethercat.c index c100d374..a8767053 100644 --- a/devices/stmmac/dwmac1000_dma-6.12-ethercat.c +++ b/devices/stmmac/dwmac1000_dma-6.12-ethercat.c @@ -276,7 +276,7 @@ static void dwmac1000_rx_watchdog(struct stmmac_priv *priv, writel(riwt, ioaddr + DMA_CHAN_RX_WATCHDOG(queue)); } -const struct stmmac_dma_ops dwmac1000_dma_ops = { +const struct stmmac_dma_ops ec_dwmac1000_dma_ops = { .reset = dwmac_dma_reset, .init_chan = dwmac1000_dma_init_channel, .init_rx_chan = dwmac1000_dma_init_rx, @@ -296,4 +296,3 @@ const struct stmmac_dma_ops dwmac1000_dma_ops = { .get_hw_feature = dwmac1000_get_hw_feature, .rx_watchdog = dwmac1000_rx_watchdog, }; -EXPORT_SYMBOL_GPL(dwmac1000_dma_ops); diff --git a/devices/stmmac/hwif-6.12-ethercat.c b/devices/stmmac/hwif-6.12-ethercat.c index fa7c9fc0..9d68ad26 100644 --- a/devices/stmmac/hwif-6.12-ethercat.c +++ b/devices/stmmac/hwif-6.12-ethercat.c @@ -148,7 +148,7 @@ static const struct stmmac_hwif_entry { .mmc_off = MMC_GMAC3_X_OFFSET, }, .desc = NULL, - .dma = &dwmac1000_dma_ops, + .dma = &ec_dwmac1000_dma_ops, .mac = &dwmac1000_ops, .hwtimestamp = &stmmac_ptp, .mode = NULL, diff --git a/devices/stmmac/hwif-6.12-ethercat.h b/devices/stmmac/hwif-6.12-ethercat.h index d5a9f01e..d9097584 100644 --- a/devices/stmmac/hwif-6.12-ethercat.h +++ b/devices/stmmac/hwif-6.12-ethercat.h @@ -686,7 +686,7 @@ struct stmmac_regs_off { extern const struct stmmac_ops dwmac100_ops; extern const struct stmmac_dma_ops dwmac100_dma_ops; extern const struct stmmac_ops dwmac1000_ops; -extern const struct stmmac_dma_ops dwmac1000_dma_ops; +extern const struct stmmac_dma_ops ec_dwmac1000_dma_ops; extern const struct stmmac_ops dwmac4_ops; extern const struct stmmac_dma_ops dwmac4_dma_ops; extern const struct stmmac_ops dwmac410_ops;