board: ti: am335x: add support to fixup phy address

On beaglebone black, it can so happen that PHY address
is not latched correctly on reset and board boots with
PHY responding to a different address than that
programmed in device-tree. For example, see this report:

https://groups.google.com/d/msg/beagleboard/9mctrG26Mc8/1FuI_i5KW10J

Workaround this by fixing up device-tree passed to kernel
by using the PHY address detected in hardware.

Beaglebone itself uses only one ethernet port and its DT
currently uses phy_id (obsoleted). But the function has
been written to handle multiple ports and phy_id as well
as phy-handle to make the function more generically useful.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index a359d20021fd97ae92b0d110b7e476b7e2347080..13845251afb5ad93e7366895934308ad504e6a28 100644 (file)
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -608,6 +608,84 @@ static struct clk_synth cdce913_data = {
 };
 #endif
 
+#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_CONTROL) && \
+       defined(CONFIG_DM_ETH) && defined(CONFIG_DRIVER_TI_CPSW)
+
+#define MAX_CPSW_SLAVES        2
+
+/* At the moment, we do not want to stop booting for any failures here */
+int ft_board_setup(void *fdt, bd_t *bd)
+{
+       const char *slave_path, *enet_name;
+       int enetnode, slavenode, phynode;
+       struct udevice *ethdev;
+       char alias[16];
+       u32 phy_id[2];
+       int phy_addr;
+       int i, ret;
+
+       /* phy address fixup needed only on beagle bone family */
+       if (!board_is_beaglebonex())
+               goto done;
+
+       for (i = 0; i < MAX_CPSW_SLAVES; i++) {
+               sprintf(alias, "ethernet%d", i);
+
+               slave_path = fdt_get_alias(fdt, alias);
+               if (!slave_path)
+                       continue;
+
+               slavenode = fdt_path_offset(fdt, slave_path);
+               if (slavenode < 0)
+                       continue;
+
+               enetnode = fdt_parent_offset(fdt, slavenode);
+               enet_name = fdt_get_name(fdt, enetnode, NULL);
+
+               ethdev = eth_get_dev_by_name(enet_name);
+               if (!ethdev)
+                       continue;
+
+               phy_addr = cpsw_get_slave_phy_addr(ethdev, i);
+
+               /* check for phy_id as well as phy-handle properties */
+               ret = fdtdec_get_int_array_count(fdt, slavenode, "phy_id",
+                                                phy_id, 2);
+               if (ret == 2) {
+                       if (phy_id[1] != phy_addr) {
+                               printf("fixing up phy_id for %s, old: %d, new: %d\n",
+                                      alias, phy_id[1], phy_addr);
+
+                               phy_id[0] = cpu_to_fdt32(phy_id[0]);
+                               phy_id[1] = cpu_to_fdt32(phy_addr);
+                               do_fixup_by_path(fdt, slave_path, "phy_id",
+                                                phy_id, sizeof(phy_id), 0);
+                       }
+               } else {
+                       phynode = fdtdec_lookup_phandle(fdt, slavenode,
+                                                       "phy-handle");
+                       if (phynode < 0)
+                               continue;
+
+                       ret = fdtdec_get_int(fdt, phynode, "reg", -ENOENT);
+                       if (ret < 0)
+                               continue;
+
+                       if (ret != phy_addr) {
+                               printf("fixing up phy-handle for %s, old: %d, new: %d\n",
+                                      alias, ret, phy_addr);
+
+                               fdt_setprop_u32(fdt, phynode, "reg",
+                                               cpu_to_fdt32(phy_addr));
+                       }
+               }
+       }
+
+done:
+       return 0;
+}
+#endif
+
 /*
  * Basic board specific setup.  Pinmux has been handled already.
  */