Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

[oweals/u-boot.git] / board / freescale / ls1046aqds / eth.c

diff --git a/board/freescale/ls1046aqds/eth.c b/board/freescale/ls1046aqds/eth.c
index abe8ee95d4e1c577fd51ba4832f8ec0a5817b083..1d40e8bd17025a4cafa2903e4094674847061de3 100644 (file)
--- a/board/freescale/ls1046aqds/eth.c
+++ b/board/freescale/ls1046aqds/eth.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2016 Freescale Semiconductor, Inc.
- * Copyright 2018 NXP
+ * Copyright 2018-2020 NXP
  */
 
 #include <common.h>
@@ -154,26 +154,24 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
                              enum fm_port port, int offset)
 {
        struct fixed_link f_link;
-       const u32 *handle;
-       const char *prop = NULL;
-       int off;
+       const char *phyconn;
 
        if (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_SGMII) {
                switch (port) {
                case FM1_DTSEC9:
-                       fdt_set_phy_handle(fdt, compat, addr, "sgmii_s1_p1");
+                       fdt_set_phy_handle(fdt, compat, addr, "sgmii-s1-p1");
                        break;
                case FM1_DTSEC10:
-                       fdt_set_phy_handle(fdt, compat, addr, "sgmii_s1_p2");
+                       fdt_set_phy_handle(fdt, compat, addr, "sgmii-s1-p2");
                        break;
                case FM1_DTSEC5:
-                       fdt_set_phy_handle(fdt, compat, addr, "sgmii_s1_p3");
+                       fdt_set_phy_handle(fdt, compat, addr, "sgmii-s1-p3");
                        break;
                case FM1_DTSEC6:
-                       fdt_set_phy_handle(fdt, compat, addr, "sgmii_s1_p4");
+                       fdt_set_phy_handle(fdt, compat, addr, "sgmii-s1-p4");
                        break;
                case FM1_DTSEC2:
-                       fdt_set_phy_handle(fdt, compat, addr, "sgmii_s4_p1");
+                       fdt_set_phy_handle(fdt, compat, addr, "sgmii-s4-p1");
                        break;
                default:
                        break;
@@ -193,16 +191,16 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
        } else if (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_QSGMII) {
                switch (port) {
                case FM1_DTSEC1:
-                       fdt_set_phy_handle(fdt, compat, addr, "qsgmii_s2_p4");
+                       fdt_set_phy_handle(fdt, compat, addr, "qsgmii-s2-p4");
                        break;
                case FM1_DTSEC5:
-                       fdt_set_phy_handle(fdt, compat, addr, "qsgmii_s2_p2");
+                       fdt_set_phy_handle(fdt, compat, addr, "qsgmii-s2-p2");
                        break;
                case FM1_DTSEC6:
-                       fdt_set_phy_handle(fdt, compat, addr, "qsgmii_s2_p1");
+                       fdt_set_phy_handle(fdt, compat, addr, "qsgmii-s2-p1");
                        break;
                case FM1_DTSEC10:
-                       fdt_set_phy_handle(fdt, compat, addr, "qsgmii_s2_p3");
+                       fdt_set_phy_handle(fdt, compat, addr, "qsgmii-s2-p3");
                        break;
                default:
                        break;
@@ -212,14 +210,11 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
                                   "qsgmii");
        } else if (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_XGMII &&
                   (port == FM1_10GEC1 || port == FM1_10GEC2)) {
-               handle = fdt_getprop(fdt, offset, "phy-handle", NULL);
-               prop = NULL;
-               if (handle) {
-                       off = fdt_node_offset_by_phandle(fdt,
-                                                        fdt32_to_cpu(*handle));
-                       prop = fdt_getprop(fdt, off, "backplane-mode", NULL);
-               }
-               if (!prop || strcmp(prop, "10gbase-kr")) {
+               phyconn = fdt_getprop(fdt, offset, "phy-connection-type", NULL);
+               if (is_backplane_mode(phyconn)) {
+                       /* Backplane KR mode: skip fixups */
+                       printf("Interface %d in backplane KR mode\n", port);
+               } else {
                        /* XFI interface */
                        f_link.phy_id = cpu_to_fdt32(port);
                        f_link.duplex = cpu_to_fdt32(1);
@@ -246,13 +241,13 @@ void fdt_fixup_board_enet(void *fdt)
                case PHY_INTERFACE_MODE_QSGMII:
                        switch (mdio_mux[i]) {
                        case EMI1_SLOT1:
-                               fdt_status_okay_by_alias(fdt, "emi1_slot1");
+                               fdt_status_okay_by_alias(fdt, "emi1-slot1");
                                break;
                        case EMI1_SLOT2:
-                               fdt_status_okay_by_alias(fdt, "emi1_slot2");
+                               fdt_status_okay_by_alias(fdt, "emi1-slot2");
                                break;
                        case EMI1_SLOT4:
-                               fdt_status_okay_by_alias(fdt, "emi1_slot4");
+                               fdt_status_okay_by_alias(fdt, "emi1-slot4");
                                break;
                        default:
                                break;