diff options
| author | Tom Rini <trini@ti.com> | 2014-12-08 16:35:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-08 16:35:07 -0500 |
| commit | 272a1acf1ef574356e5da51f7d6b3b07ab4e9b83 (patch) | |
| tree | b65e7b532ac7beb91cfbf3b16f1df76a3a65d59d /board/freescale/corenet_ds/eth_hydra.c | |
| parent | 98d2d5e8c473232dc718763dbec284b7349dcc05 (diff) | |
| parent | af7219de2c66b64ddae0348b3d3fa5072d800dd2 (diff) | |
Merge git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board/freescale/corenet_ds/eth_hydra.c')
| -rw-r--r-- | board/freescale/corenet_ds/eth_hydra.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c index 35825c4ae9..396103f990 100644 --- a/board/freescale/corenet_ds/eth_hydra.c +++ b/board/freescale/corenet_ds/eth_hydra.c @@ -62,7 +62,7 @@ #ifdef CONFIG_FMAN_ENET -#define BRDCFG1_EMI1_SEL_MASK 0x70 +#define BRDCFG1_EMI1_SEL_MASK 0x78 #define BRDCFG1_EMI1_SEL_SLOT1 0x10 #define BRDCFG1_EMI1_SEL_SLOT2 0x20 #define BRDCFG1_EMI1_SEL_SLOT5 0x30 @@ -202,6 +202,8 @@ static void fdt_set_mdio_mux(void *fdt, const char *alias, u32 mux) if (!path) path = alias; + do_fixup_by_path(fdt, path, "reg", + &mux, sizeof(mux), 1); do_fixup_by_path(fdt, path, "fsl,hydra-mdio-muxval", &mux, sizeof(mux), 1); } @@ -250,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 */ |