libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>

[u-boot] / board / freescale / ls1043aqds / eth.c

diff --git a/board/freescale/ls1043aqds/eth.c b/board/freescale/ls1043aqds/eth.c
index 88b10a0f2f1223866d82e461dea4fb378d7841b1..e8639e09ad5dafd05de21d7001e0e8e43bdcbab1 100644 (file)
--- a/board/freescale/ls1043aqds/eth.c
+++ b/board/freescale/ls1043aqds/eth.c
@@ -7,9 +7,11 @@
 #include <common.h>
 #include <asm/io.h>
 #include <netdev.h>
+#include <fdt_support.h>
 #include <fm_eth.h>
 #include <fsl_mdio.h>
 #include <fsl_dtsec.h>
+#include <linux/libfdt.h>
 #include <malloc.h>
 #include <asm/arch/fsl_serdes.h>
 
@@ -174,9 +176,9 @@ 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_SGMII_2500) {
                /* 2.5G SGMII interface */
-               f_link.phy_id = port;
-               f_link.duplex = 1;
-               f_link.link_speed = 1000;
+               f_link.phy_id = cpu_to_fdt32(port);
+               f_link.duplex = cpu_to_fdt32(1);
+               f_link.link_speed = cpu_to_fdt32(1000);
                f_link.pause = 0;
                f_link.asym_pause = 0;
                /* no PHY for 2.5G SGMII */
@@ -239,9 +241,9 @@ 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_XGMII &&
                   port == FM1_10GEC1) {
                /* XFI interface */
-               f_link.phy_id = port;
-               f_link.duplex = 1;
-               f_link.link_speed = 10000;
+               f_link.phy_id = cpu_to_fdt32(port);
+               f_link.duplex = cpu_to_fdt32(1);
+               f_link.link_speed = cpu_to_fdt32(10000);
                f_link.pause = 0;
                f_link.asym_pause = 0;
                /* no PHY for XFI */
@@ -474,6 +476,7 @@ int board_eth_init(bd_t *bis)
                        }
                        break;
                case PHY_INTERFACE_MODE_RGMII:
+               case PHY_INTERFACE_MODE_RGMII_TXID:
                        if (i == FM1_DTSEC3)
                                mdio_mux[i] = EMI1_RGMII1;
                        else if (i == FM1_DTSEC4)