net: zynq-gem: Setup and use mdio base separately

Not all IPs have private MDIO bus and MDIO bus should be shared between
several IPs. In past one patch tried to implement it
(https://lists.denx.de/pipermail/u-boot/2018-February/319285.html)
in pretty raw way but it is not the cleanest solution.
This patch is just taking the part of that solution to be able to handle it
over releases without conflicts.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index cfd14665a70d1d06438acc4fe0cccc2ad2be33e7..a158824fc9fdefc6093ca2dd8527d042caaab9c1 100644 (file)
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -197,6 +197,7 @@ struct zynq_gem_priv {
        int phyaddr;
        int init;
        struct zynq_gem_regs *iobase;
+       struct zynq_gem_regs *mdiobase;
        phy_interface_t interface;
        struct phy_device *phydev;
        ofnode phy_of_node;
@@ -211,7 +212,7 @@ static int phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum,
                        u32 op, u16 *data)
 {
        u32 mgtcr;
-       struct zynq_gem_regs *regs = priv->iobase;
+       struct zynq_gem_regs *regs = priv->mdiobase;
        int err;
 
        err = wait_for_bit_le32(&regs->nwsr, ZYNQ_GEM_NWSR_MDIOIDLE_MASK,
@@ -297,7 +298,7 @@ static int zynq_phy_init(struct udevice *dev)
 {
        int ret;
        struct zynq_gem_priv *priv = dev_get_priv(dev);
-       struct zynq_gem_regs *regs = priv->iobase;
+       struct zynq_gem_regs *regs_mdio = priv->mdiobase;
        const u32 supported = SUPPORTED_10baseT_Half |
                        SUPPORTED_10baseT_Full |
                        SUPPORTED_100baseT_Half |
@@ -306,7 +307,7 @@ static int zynq_phy_init(struct udevice *dev)
                        SUPPORTED_1000baseT_Full;
 
        /* Enable only MDIO bus */
-       writel(ZYNQ_GEM_NWCTRL_MDEN_MASK, &regs->nwctrl);
+       writel(ZYNQ_GEM_NWCTRL_MDEN_MASK, &regs_mdio->nwctrl);
 
        priv->phydev = phy_connect(priv->bus, priv->phyaddr, dev,
                                   priv->interface);
@@ -335,6 +336,7 @@ static int zynq_gem_init(struct udevice *dev)
        unsigned long clk_rate = 0;
        struct zynq_gem_priv *priv = dev_get_priv(dev);
        struct zynq_gem_regs *regs = priv->iobase;
+       struct zynq_gem_regs *regs_mdio = priv->mdiobase;
        struct emac_bd *dummy_tx_bd = &priv->tx_bd[TX_FREE_DESC];
        struct emac_bd *dummy_rx_bd = &priv->tx_bd[TX_FREE_DESC + 2];
 
@@ -402,7 +404,7 @@ static int zynq_gem_init(struct udevice *dev)
                writel(ZYNQ_GEM_DMACR_INIT, &regs->dmacr);
 
                /* Setup for Network Control register, MDIO, Rx and Tx enable */
-               setbits_le32(&regs->nwctrl, ZYNQ_GEM_NWCTRL_MDEN_MASK);
+               setbits_le32(&regs_mdio->nwctrl, ZYNQ_GEM_NWCTRL_MDEN_MASK);
 
                /* Disable the second priority queue */
                dummy_tx_bd->addr = 0;
@@ -743,6 +745,7 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
 
        pdata->iobase = (phys_addr_t)dev_read_addr(dev);
        priv->iobase = (struct zynq_gem_regs *)pdata->iobase;
+       priv->mdiobase = priv->iobase;
        /* Hardcode for now */
        priv->phyaddr = -1;
 
@@ -768,8 +771,9 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
 
        priv->int_pcs = dev_read_bool(dev, "is-internal-pcspma");
 
-       printf("ZYNQ GEM: %lx, phyaddr %x, interface %s\n", (ulong)priv->iobase,
-              priv->phyaddr, phy_string_for_interface(priv->interface));
+       printf("\nZYNQ GEM: %lx, mdio bus %lx, phyaddr %d, interface %s\n",
+              (ulong)priv->iobase, (ulong)priv->mdiobase, priv->phyaddr,
+              phy_string_for_interface(priv->interface));
 
        return 0;
 }