powerpc/hydra: fix judging condition of RGMII selection
authorMinghuan Lian <Minghuan.Lian@freescale.com>
Mon, 24 Nov 2014 10:20:46 +0000 (18:20 +0800)
committerYork Sun <yorksun@freescale.com>
Fri, 5 Dec 2014 16:06:17 +0000 (08:06 -0800)
BRDCFG1_EMI1_SEL_MASK has been changed to 0x78, which contains
selection bits and connected status bit. So the Corresponding mux
value of RGMII is changed to BRDCFG1_EMI1_SEL_RGMII | BRDCFG1_EMI1_EN.

Signed-off-by: Minghuan Lian <Minghuan.Lian@freescale.com>
Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
board/freescale/corenet_ds/eth_hydra.c

index a934c8cf0d9432ef135419b1529733d74a25d56d..396103f9906e1b3b67d3138bdae3d30028e05eee 100644 (file)
@@ -252,11 +252,12 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
                return;
        }
 
-       if (mux == BRDCFG1_EMI1_SEL_RGMII) {
+       if (mux == (BRDCFG1_EMI1_SEL_RGMII | BRDCFG1_EMI1_EN)) {
                /* RGMII */
                /* The RGMII PHY is identified by the MAC connected to it */
                sprintf(phy, "phy_rgmii_%u", port == FM1_DTSEC4 ? 0 : 1);
                fdt_set_phy_handle(fdt, compat, addr, phy);
+               return;
        }
 
        /* If it's not RGMII or XGMII, it must be SGMII */