Skip to contentSkip to conversation

board/t102x: use fdt_setprop_string instead of fdt_setprop

PATCH New Shengzhou Liu 2 participants 2 messages Apr 14, 2015 – May 5, 2015

lore
Share & tools
lore

Shengzhou Liu

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 board/freescale/t102xqds/eth_t102xqds.c | 9 +++++----
 board/freescale/t102xrdb/eth_t102xrdb.c | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)
board/freescale/t102xqds/eth_t102xqds.c +5 -4
index 7723f58..441d6a3 100644
@@ -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");
 	}
 }
board/freescale/t102xrdb/eth_t102xrdb.c +2 -2
index dd386bc..856ec6e 100644
@@ -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
Signature · 1 line
2.1.0.27.g96db324
#1 lore raw

PATCH 1/1 board/t102x: use fdt_setprop_string instead of fdt_setprop

Quoted 8 lines · Shengzhou Liu

Use fdt_setprop_string instead of fdt_setprop to fix string length.

Signed-off-by Shengzhou Liu <[email protected]>
---
 board/freescale/t102xqds/eth_t102xqds.c | 9 +++++----
 board/freescale/t102xrdb/eth_t102xrdb.c | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

Applied to u-boot-mpc85xx master. Awaiting upstream.

York