board: lx2160aqds: fix ethernet-phy compatible property

[oweals/u-boot.git] / board / freescale / lx2160a / eth_lx2160aqds.c

diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index 1e98d0c1f98fdf39951b21ed2c8b0ba731537a6a..48ff495902a448268958185de2c7bcf9dc48fa54 100644 (file)
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <hwconfig.h>
 #include <command.h>
 #include <netdev.h>
@@ -628,8 +629,9 @@ int fdt_fixup_dpmac_phy_handle(void *fdt, int dpmac_id, int node_phandle)
 int fdt_get_ioslot_offset(void *fdt, struct mii_dev *mii_dev, int fpga_offset)
 {
        char mdio_ioslot_str[] = "mdio@00";
-       char mdio_mux_str[] = "mdio-mux-0";
        struct lx2160a_qds_mdio *priv;
+       u64 reg;
+       u32 phandle;
        int offset, mux_val;
 
        /*Test if the MDIO bus is real mdio bus or muxing front end ?*/
@@ -643,15 +645,32 @@ int fdt_get_ioslot_offset(void *fdt, struct mii_dev *mii_dev, int fpga_offset)
        debug("real_bus_num = %d, ioslot = %d\n",
              priv->realbusnum, priv->ioslot);
 
-       sprintf(mdio_mux_str, "mdio-mux-%1d", priv->realbusnum);
-       offset = fdt_subnode_offset(fdt, fpga_offset, mdio_mux_str);
+       if (priv->realbusnum == EMI1)
+               reg = CONFIG_SYS_FSL_WRIOP1_MDIO1;
+       else
+               reg = CONFIG_SYS_FSL_WRIOP1_MDIO2;
+
+       offset = fdt_node_offset_by_compat_reg(fdt, "fsl,fman-memac-mdio", reg);
+       if (offset < 0) {
+               printf("mdio@%llx node not found in device tree\n", reg);
+               return offset;
+       }
+
+       phandle = fdt_get_phandle(fdt, offset);
+       phandle = cpu_to_fdt32(phandle);
+       offset = fdt_node_offset_by_prop_value(fdt, -1, "mdio-parent-bus",
+                                              &phandle, 4);
        if (offset < 0) {
-               printf("%s node not found under node %s in device tree\n",
-                      mdio_mux_str, fdt_get_name(fdt, fpga_offset, NULL));
+               printf("mdio-mux-%d node not found in device tree\n",
+                      priv->realbusnum == EMI1 ? 1 : 2);
                return offset;
        }
 
        mux_val = lx2160a_qds_get_mdio_mux_val(priv->realbusnum, priv->ioslot);
+       if (priv->realbusnum == EMI1)
+               mux_val >>= BRDCFG4_EMI1SEL_SHIFT;
+       else
+               mux_val >>= BRDCFG4_EMI2SEL_SHIFT;
        sprintf(mdio_ioslot_str, "mdio@%x", (u8)mux_val);
 
        offset = fdt_subnode_offset(fdt, offset, mdio_ioslot_str);
@@ -667,7 +686,7 @@ int fdt_create_phy_node(void *fdt, int offset, u8 phyaddr, int *subnodeoffset,
                        struct phy_device *phy_dev, int phandle)
 {
        char phy_node_name[] = "ethernet-phy@00";
-       char phy_id_compatible_str[] = "ethernet-phy-id0000.0000";
+       char phy_id_compatible_str[] = "ethernet-phy-id0000.0000,";
        int ret;
 
        sprintf(phy_node_name, "ethernet-phy@%x", phyaddr);
@@ -675,11 +694,13 @@ int fdt_create_phy_node(void *fdt, int offset, u8 phyaddr, int *subnodeoffset,
 
        *subnodeoffset = fdt_add_subnode(fdt, offset, phy_node_name);
        if (*subnodeoffset <= 0) {
-               printf("Could not add subnode %s\n", phy_node_name);
+               printf("Could not add subnode %s inside node %s err = %s\n",
+                      phy_node_name, fdt_get_name(fdt, offset, NULL),
+                      fdt_strerror(*subnodeoffset));
                return *subnodeoffset;
        }
 
-       sprintf(phy_id_compatible_str, "ethernet-phy-id%04x.%04x",
+       sprintf(phy_id_compatible_str, "ethernet-phy-id%04x.%04x,",
                phy_dev->phy_id >> 16, phy_dev->phy_id & 0xFFFF);
        debug("phy_id_compatible_str %s\n", phy_id_compatible_str);
 
@@ -779,7 +800,6 @@ int fdt_fixup_board_phy(void *fdt)
                        }
                        if (dpmac_id == NUM_WRIOP_PORTS)
                                continue;
-
                        ret = fdt_create_phy_node(fdt, offset, i,
                                                  &subnodeoffset,
                                                  phy_dev, phandle);
@@ -792,6 +812,11 @@ int fdt_fixup_board_phy(void *fdt)
                                fdt_del_node(fdt, subnodeoffset);
                                break;
                        }
+                       /* calculate offset again as new node addition may have
+                        * changed offset;
+                        */
+                       offset = fdt_get_ioslot_offset(fdt, mii_dev,
+                                                      fpga_offset);
                        phandle++;
                }