@@ -324,16 +324,16 @@ static int sun8i_emac_set_syscon(struct sun8i_eth_pdata *pdata,
if (priv->variant == R40_GMAC) {
/* Select RGMII for R40 */
- reg = readl(priv->sysctl_reg + 0x164);
+ reg = readl(priv->sysctl_reg);
reg |= SC_ETCS_INT_GMII |
SC_EPIT |
(CONFIG_GMAC_TX_DELAY << SC_ETXDC_OFFSET);
- writel(reg, priv->sysctl_reg + 0x164);
+ writel(reg, priv->sysctl_reg);
return 0;
}
- reg = readl(priv->sysctl_reg + 0x30);
+ reg = readl(priv->sysctl_reg);
reg = sun8i_emac_set_syscon_ephy(priv, reg);
@@ -374,7 +374,7 @@ static int sun8i_emac_set_syscon(struct sun8i_eth_pdata *pdata,
reg |= ((pdata->rx_delay_ps / 100) << SC_ERXDC_OFFSET)
& SC_ERXDC_MASK;
- writel(reg, priv->sysctl_reg + 0x30);
+ writel(reg, priv->sysctl_reg);
return 0;
}
@@ -916,6 +916,10 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev)
debug("%s: Cannot find syscon base address\n", __func__);
return -EINVAL;
}
+ if (priv->variant == R40_GMAC)
+ priv->sysctl_reg += 0x164;
+ else
+ priv->sysctl_reg += 0x30;
pdata->phy_interface = -1;
priv->phyaddr = -1;
Most SoCs using the sun8i-emac IP use a register in the "syscon" area to control some PHY related settings. The R40 is special, since this register is located in the CCU IP. So far we were storing the *base* address in our priv struct, then adding the offset later when we need to use it. Change the code to add the offset already when we parse the DT node, so that sysctl_reg contains the final EPHY register address. This simplifies adding support for the two EMACs on the H616 later. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- drivers/net/sun8i_emac.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)