Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-30 00:21:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: sun8i_emac: Retrieve GMAC clock via 'syscon' phandle

Browse source 
Unlike other Allwinner SoC's R40 GMAC clock control register
is locate in CCU, but rest located via syscon itself. Since
the phandle property for current code look for 'syscon' and
it will grab the respective ccu or syscon base address based
on DT property defined in respective SoC dtsi.

So, use the existing 'syscon' code even for R40 for retrieving
GMAC clock via CCU and update the register directly in
sun8i_emac_set_syscon instead of writing it separately using
ccm base.

Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Lothar Felten <lothar.felten@gmail.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
Jagan Teki 2019-02-28 00:26:51 +05:30
parent 0ed8eaf1de
commit 695f6043c9
1 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
drivers/net/sun8i_emac.c
View file

@ -285,10 +285,18 @@ static int sun8i_emac_set_syscon(struct sun8i_eth_pdata *pdata,
int ret; int ret;
u32 reg; u32 reg;
reg = readl(priv->sysctl_reg + 0x30); if (priv->variant == R40_GMAC) {
/* Select RGMII for R40 */
reg = readl(priv->sysctl_reg + 0x164);
reg |= CCM_GMAC_CTRL_TX_CLK_SRC_INT_RGMII |
CCM_GMAC_CTRL_GPIT_RGMII |
CCM_GMAC_CTRL_TX_CLK_DELAY(CONFIG_GMAC_TX_DELAY);
if (priv->variant == R40_GMAC) writel(reg, priv->sysctl_reg + 0x164);
return 0; return 0;
}
reg = readl(priv->sysctl_reg + 0x30);
if (priv->variant == H3_EMAC) { if (priv->variant == H3_EMAC) {
ret = sun8i_emac_set_syscon_ephy(priv, &reg); ret = sun8i_emac_set_syscon_ephy(priv, &reg);
@ -662,13 +670,6 @@ static void sun8i_emac_board_setup(struct emac_eth_dev *priv)
/* De-assert EMAC */ /* De-assert EMAC */
setbits_le32(&ccm->ahb_gate1, BIT(AHB_GATE_OFFSET_GMAC)); setbits_le32(&ccm->ahb_gate1, BIT(AHB_GATE_OFFSET_GMAC));
/* Select RGMII for R40 */
setbits_le32(&ccm->gmac_clk_cfg,
CCM_GMAC_CTRL_TX_CLK_SRC_INT_RGMII |
CCM_GMAC_CTRL_GPIT_RGMII);
setbits_le32(&ccm->gmac_clk_cfg,
CCM_GMAC_CTRL_TX_CLK_DELAY(CONFIG_GMAC_TX_DELAY));
} else { } else {
/* Set clock gating for emac */ /* Set clock gating for emac */
setbits_le32(&ccm->ahb_gate0, BIT(AHB_GATE_OFFSET_GMAC)); setbits_le32(&ccm->ahb_gate0, BIT(AHB_GATE_OFFSET_GMAC));
@ -850,25 +851,23 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev)
return -EINVAL; return -EINVAL;
} }
if (priv->variant != R40_GMAC) { offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "syscon");
offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "syscon"); if (offset < 0) {
if (offset < 0) { debug("%s: cannot find syscon node\n", __func__);
debug("%s: cannot find syscon node\n", __func__); return -EINVAL;
return -EINVAL; }
}
reg = fdt_getprop(gd->fdt_blob, offset, "reg", NULL); reg = fdt_getprop(gd->fdt_blob, offset, "reg", NULL);
if (!reg) { if (!reg) {
debug("%s: cannot find reg property in syscon node\n", debug("%s: cannot find reg property in syscon node\n",
__func__); __func__);
return -EINVAL; return -EINVAL;
} }
priv->sysctl_reg = fdt_translate_address((void *)gd->fdt_blob, priv->sysctl_reg = fdt_translate_address((void *)gd->fdt_blob,
offset, reg); offset, reg);
if (priv->sysctl_reg == FDT_ADDR_T_NONE) { if (priv->sysctl_reg == FDT_ADDR_T_NONE) {
debug("%s: Cannot find syscon base address\n", debug("%s: Cannot find syscon base address\n", __func__);
__func__); return -EINVAL;
return -EINVAL;
}
} }
pdata->phy_interface = -1; pdata->phy_interface = -1;