From: Minghuan Lian Date: Mon, 24 Nov 2014 10:20:46 +0000 (+0800) Subject: powerpc/hydra: fix judging condition of RGMII selection X-Git-Tag: v2015.01-rc3~1^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=af7219de2c66b64ddae0348b3d3fa5072d800dd2;p=oweals%2Fu-boot.git powerpc/hydra: fix judging condition of RGMII selection 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 Signed-off-by: Shaohui Xie Reviewed-by: York Sun --- diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c index a934c8cf0d..396103f990 100644 --- a/board/freescale/corenet_ds/eth_hydra.c +++ b/board/freescale/corenet_ds/eth_hydra.c @@ -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 */