Skip to contentSkip to conversation

powerpc/hydra: Update MDIO mux fixups

PATCH New Chunhe Lan 2 participants 2 messages Nov 18, 2014 – Dec 5, 2014

lore
Share & tools
lore

Chunhe Lan

author
#0 lore raw

PATCH 1/1 powerpc/hydra: Update MDIO mux fixups

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.

---
 board/freescale/corenet_ds/eth_hydra.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
board/freescale/corenet_ds/eth_hydra.c +3 -1
index 35825c4..a934c8c 100644
@@ -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);
 }
Signature · 1 line
1.7.6.5
#1 lore raw

PATCH 1/1 powerpc/hydra: Update MDIO mux fixups

Quoted 10 lines · Chunhe Lan

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.

---

Applied to u-boot-mpc85xx, awaiting upstream.

York