net: zynq: Don't overwrite gem_rclk_ctrl with default value
The gem[0-1]_rclk_ctrl registers control the source of the rx clock, control and data signals and configure via ps7_init function. Don't overwrite the register with the default value. Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> Reviewed-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
parent
85d0bea153
commit
a259243e9d
|
@ -140,13 +140,6 @@ void zynq_slcr_gem_clk_setup(u32 gem_id, unsigned long clk_rate)
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (gem_id) {
|
|
||||||
/* Configure GEM_RCLK_CTRL */
|
|
||||||
writel(1, &slcr_base->gem1_rclk_ctrl);
|
|
||||||
} else {
|
|
||||||
/* Configure GEM_RCLK_CTRL */
|
|
||||||
writel(1, &slcr_base->gem0_rclk_ctrl);
|
|
||||||
}
|
|
||||||
udelay(100000);
|
udelay(100000);
|
||||||
out:
|
out:
|
||||||
zynq_slcr_lock();
|
zynq_slcr_lock();
|
||||||
|
|
|
@ -175,7 +175,6 @@ struct zynq_gem_priv {
|
||||||
u32 rxbd_current;
|
u32 rxbd_current;
|
||||||
u32 rx_first_buf;
|
u32 rx_first_buf;
|
||||||
int phyaddr;
|
int phyaddr;
|
||||||
u32 emio;
|
|
||||||
int init;
|
int init;
|
||||||
struct zynq_gem_regs *iobase;
|
struct zynq_gem_regs *iobase;
|
||||||
phy_interface_t interface;
|
phy_interface_t interface;
|
||||||
|
@ -457,15 +456,13 @@ static int zynq_gem_init(struct udevice *dev)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Change the rclk and clk only not using EMIO interface */
|
|
||||||
if (!priv->emio)
|
|
||||||
#ifndef CONFIG_CLK_ZYNQMP
|
#ifndef CONFIG_CLK_ZYNQMP
|
||||||
zynq_slcr_gem_clk_setup((ulong)priv->iobase !=
|
zynq_slcr_gem_clk_setup((ulong)priv->iobase !=
|
||||||
ZYNQ_GEM_BASEADDR0, clk_rate);
|
ZYNQ_GEM_BASEADDR0, clk_rate);
|
||||||
#else
|
#else
|
||||||
ret = clk_set_rate(&priv->clk, clk_rate);
|
ret = clk_set_rate(&priv->clk, clk_rate);
|
||||||
if (IS_ERR_VALUE(ret))
|
if (IS_ERR_VALUE(ret))
|
||||||
return -1;
|
return -1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
setbits_le32(®s->nwctrl, ZYNQ_GEM_NWCTRL_RXEN_MASK |
|
setbits_le32(®s->nwctrl, ZYNQ_GEM_NWCTRL_RXEN_MASK |
|
||||||
|
@ -690,7 +687,6 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
|
||||||
pdata->iobase = (phys_addr_t)dev_get_addr(dev);
|
pdata->iobase = (phys_addr_t)dev_get_addr(dev);
|
||||||
priv->iobase = (struct zynq_gem_regs *)pdata->iobase;
|
priv->iobase = (struct zynq_gem_regs *)pdata->iobase;
|
||||||
/* Hardcode for now */
|
/* Hardcode for now */
|
||||||
priv->emio = 0;
|
|
||||||
priv->phyaddr = -1;
|
priv->phyaddr = -1;
|
||||||
|
|
||||||
priv->phy_of_handle = fdtdec_lookup_phandle(gd->fdt_blob, node,
|
priv->phy_of_handle = fdtdec_lookup_phandle(gd->fdt_blob, node,
|
||||||
|
@ -708,8 +704,6 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
|
||||||
}
|
}
|
||||||
priv->interface = pdata->phy_interface;
|
priv->interface = pdata->phy_interface;
|
||||||
|
|
||||||
priv->emio = fdtdec_get_bool(gd->fdt_blob, node, "xlnx,emio");
|
|
||||||
|
|
||||||
printf("ZYNQ GEM: %lx, phyaddr %x, interface %s\n", (ulong)priv->iobase,
|
printf("ZYNQ GEM: %lx, phyaddr %x, interface %s\n", (ulong)priv->iobase,
|
||||||
priv->phyaddr, phy_string_for_interface(priv->interface));
|
priv->phyaddr, phy_string_for_interface(priv->interface));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue