From ea753267d56b6fcb097aff15a8831ef51dc9d615 Mon Sep 17 00:00:00 2001
From: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Date: Tue, 14 Apr 2015 17:56:50 +0800
Subject: [PATCH] board/t102x: use fdt_setprop_string instead of fdt_setprop
Use fdt_setprop_string instead of fdt_setprop to fix string length.
Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
---
board/freescale/t102xqds/eth_t102xqds.c | 9 +++++----
board/freescale/t102xrdb/eth_t102xrdb.c | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/board/freescale/t102xqds/eth_t102xqds.c b/board/freescale/t102xqds/eth_t102xqds.c
index 7723f580db..441d6a3e61 100644
--- a/board/freescale/t102xqds/eth_t102xqds.c
+++ b/board/freescale/t102xqds/eth_t102xqds.c
@@ -172,8 +172,8 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
if (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_RGMII) {
if (port == FM1_DTSEC3) {
fdt_set_phy_handle(fdt, compat, addr, "rgmii_phy2");
- fdt_setprop(fdt, offset, "phy-connection-type",
- "rgmii", 5);
+ fdt_setprop_string(fdt, offset, "phy-connection-type",
+ "rgmii");
fdt_status_okay_by_alias(fdt, "emi1_rgmii1");
}
} else if (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_SGMII) {
@@ -207,7 +207,8 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
break;
}
fdt_delprop(fdt, offset, "phy-connection-type");
- fdt_setprop(fdt, offset, "phy-connection-type", "qsgmii", 6);
+ fdt_setprop_string(fdt, offset, "phy-connection-type",
+ "qsgmii");
fdt_status_okay_by_alias(fdt, "emi1_slot2");
} else if (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_XGMII) {
/* XFI interface */
@@ -219,7 +220,7 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
/* no PHY for XFI */
fdt_delprop(fdt, offset, "phy-handle");
fdt_setprop(fdt, offset, "fixed-link", &f_link, sizeof(f_link));
- fdt_setprop(fdt, offset, "phy-connection-type", "xgmii", 5);
+ fdt_setprop_string(fdt, offset, "phy-connection-type", "xgmii");
}
}
diff --git a/board/freescale/t102xrdb/eth_t102xrdb.c b/board/freescale/t102xrdb/eth_t102xrdb.c
index dd386bc3a9..856ec6e227 100644
--- a/board/freescale/t102xrdb/eth_t102xrdb.c
+++ b/board/freescale/t102xrdb/eth_t102xrdb.c
@@ -133,8 +133,8 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
(fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_SGMII)) &&
(port == FM1_DTSEC3)) {
fdt_set_phy_handle(fdt, compat, addr, "sg_2500_aqr105_phy4");
- fdt_setprop(fdt, offset, "phy-connection-type",
- "sgmii-2500", 10);
+ fdt_setprop_string(fdt, offset, "phy-connection-type",
+ "sgmii-2500");
fdt_status_disabled_by_alias(fdt, "xg_aqr105_phy3");
}
#endif
--
2.39.5