| Message ID | 1416280314-3086-1-git-send-email-Chunhe.Lan@freescale.com |
|---|---|
| State | Accepted |
| Delegated to: | York Sun |
| Headers | show |
On 11/17/2014 07:11 PM, Chunhe Lan wrote: > The new device trees use a more generic interface for > supporting muxing mdio buses. The mux property is thus > specified in "reg", rather than "fsl,hydra-mdio-muxval". > > In order to support using old device trees, we keep the > old fixup in there. Linux will therefore see the both > properties, but will ignore fsl,hydra-mdio-muxval. > > Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com> > --- Applied to u-boot-mpc85xx, awaiting upstream. York
diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c index 35825c4..a934c8c 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); }
The new device trees use a more generic interface for supporting muxing mdio buses. The mux property is thus specified in "reg", rather than "fsl,hydra-mdio-muxval". In order to support using old device trees, we keep the old fixup in there. Linux will therefore see the both properties, but will ignore fsl,hydra-mdio-muxval. Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com> --- board/freescale/corenet_ds/eth_hydra.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)