fsl_pq_mido: Set the first UCC as the mii management interface master

Current code makes the UCC whose register range includes the current mdio
register to be the MII managemnt interface master of the QE. If there is more
than one mdio bus for QE, the UCC of the last mdio bus will be the MII
management interface master which will make the primary mdio bus working
unproperly, e.g. can not get the right clock. Normally the primary mdio bus is
the first UEC's mdio bus.
This patch allows the first UCC to be the MII management interface master of the
multiple UCC mdio buses.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/fsl_pq_mdio.c
index d12e0e0336f45b72b6285c8e7c16ba16802c3472..3af581303ca2b79577d18d0df4d6c64b6d341152 100644 (file)
--- a/drivers/net/fsl_pq_mdio.c
+++ b/drivers/net/fsl_pq_mdio.c
@@ -301,13 +301,17 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
                        of_device_is_compatible(np, "ucc_geth_phy")) {
 #ifdef CONFIG_UCC_GETH
                u32 id;
+               static u32 mii_mng_master;
 
                tbipa = &regs->utbipar;
 
                if ((err = get_ucc_id_for_range(addr, addr + size, &id)))
                        goto err_free_irqs;
 
-               ucc_set_qe_mux_mii_mng(id - 1);
+               if (!mii_mng_master) {
+                       mii_mng_master = id;
+                       ucc_set_qe_mux_mii_mng(id - 1);
+               }
 #else
                err = -ENODEV;
                goto err_free_irqs;