board: freescale: t208xrdb: add Linux fdt fix-ups for rev D

The T2080RDB boards revisions D and up have updated 10G Aquantia PHYs
connected to MAC1 and MAC2. The second Aquantia PHY is located at a
different address on the MDIO bus compared to rev C (0x8 instead of 0x1).

Fix-up the Linux device tree to update the PHY address for the second
Aquantia PHY on boards revisions D and up. Also rename the PHY node to
reflect the changes.

Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
[Rebased]
Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/board/freescale/t208xrdb/eth_t208xrdb.c b/board/freescale/t208xrdb/eth_t208xrdb.c
index 4b44b1617d6cdcfa4aab3df51d28b9081e418887..e4592eac1530692773b3268bbd4b3f8d5c8551ef 100644 (file)
--- a/board/freescale/t208xrdb/eth_t208xrdb.c
+++ b/board/freescale/t208xrdb/eth_t208xrdb.c
@@ -26,6 +26,8 @@
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
 
+extern u8 get_hw_revision(void);
+
 /* Disable the MAC5 and MAC6 "fsl,fman-memac" nodes and the two
  * "fsl,dpa-ethernet" nodes that reference them.
  */
@@ -60,6 +62,39 @@ void fdt_fixup_board_fman_ethernet(void *fdt)
        }
 }
 
+/* Update the address of the second Aquantia PHY on boards revision D and up.
+ * Also rename the PHY node to align with the address change.
+ */
+void fdt_fixup_board_phy(void *fdt)
+{
+       const char phy_path[] =
+               "/soc@ffe000000/fman@400000/mdio@fd000/ethernet-phy@1";
+       int ret, offset, new_addr = AQR113C_PHY_ADDR2;
+       char new_name[] = "ethernet-phy@00";
+
+       if (get_hw_revision() == 'C')
+               return;
+
+       offset = fdt_path_offset(fdt, phy_path);
+       if (offset < 0) {
+               printf("ethernet-phy@1 node not found in the dts\n");
+               return;
+       }
+
+       ret = fdt_setprop(fdt, offset, "reg", &new_addr, sizeof(new_addr));
+       if (ret < 0) {
+               printf("Unable to set 'reg' for node ethernet-phy@1: %s\n",
+                      fdt_strerror(ret));
+               return;
+       }
+
+       sprintf(new_name, "ethernet-phy@%x", new_addr);
+       ret = fdt_set_name(fdt, offset, new_name);
+       if (ret < 0)
+               printf("Unable to rename node ethernet-phy@1: %s\n",
+                      fdt_strerror(ret));
+}
+
 void fdt_fixup_board_enet(void *fdt)
 {
        return;

diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c
index f7fa65d1a166a56fe58f34e2a8faacdce837c7d9..1f0cdee0b8634b4f2c0b8f73b9e385322ba075ee 100644 (file)
--- a/board/freescale/t208xrdb/t208xrdb.c
+++ b/board/freescale/t208xrdb/t208xrdb.c
@@ -153,6 +153,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 #ifdef CONFIG_SYS_DPAA_FMAN
        fdt_fixup_board_fman_ethernet(blob);
        fdt_fixup_board_enet(blob);
+       fdt_fixup_board_phy(blob);
 #endif
 
        return 0;

diff --git a/board/freescale/t208xrdb/t208xrdb.h b/board/freescale/t208xrdb/t208xrdb.h
index cd0a9f44da79850b7ab52aa0aefa75b7dd51205d..edbc860c9d02e13a036f17e7b1cf10d3538d187e 100644 (file)
--- a/board/freescale/t208xrdb/t208xrdb.h
+++ b/board/freescale/t208xrdb/t208xrdb.h
@@ -10,5 +10,6 @@
 void fdt_fixup_board_enet(void *blob);
 void pci_of_setup(void *blob, struct bd_info *bd);
 void fdt_fixup_board_fman_ethernet(void *blob);
+void fdt_fixup_board_phy(void *blob);
 
 #endif

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index b5197b3ed9542ed1c2cc2c4b9fd3cb0a27ec6982..9449e30bfca623b1aae26a6fd10faaedd9b432d9 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -537,8 +537,12 @@ unsigned long get_board_ddr_clk(void);
 #define RGMII_PHY2_ADDR                0x02
 #define CORTINA_PHY_ADDR1      0x0c  /* Cortina CS4315 */
 #define CORTINA_PHY_ADDR2      0x0d
-#define FM1_10GEC3_PHY_ADDR    0x00  /* Aquantia AQ1202 10G Base-T */
+/* Aquantia AQ1202 10G Base-T used by board revisions up to C */
+#define FM1_10GEC3_PHY_ADDR    0x00
 #define FM1_10GEC4_PHY_ADDR    0x01
+/* Aquantia AQR113C 10G Base-T used by board revisions D and up */
+#define AQR113C_PHY_ADDR1      0x00
+#define AQR113C_PHY_ADDR2      0x08
 #endif
 
 #ifdef CONFIG_FMAN_ENET