Skip to content
Snippets Groups Projects
Commit f09880ea authored by Kim Phillips's avatar Kim Phillips
Browse files

mpc83xx: fix phy-connection-type fixup code


use tree passed to us in local blob, not global fdt.

Also use fdt_path_offset to convert to relative offset, since absolute
reference is needed to check for rgmii-id mode string value.

Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
parent 2b4c952b
No related branches found
No related tags found
No related merge requests found
...@@ -318,28 +318,34 @@ void ft_board_setup(void *blob, bd_t *bd) ...@@ -318,28 +318,34 @@ void ft_board_setup(void *blob, bd_t *bd)
const char *prop; const char *prop;
const char *path; const char *path;
nodeoffset = fdt_path_offset(fdt, "/aliases"); nodeoffset = fdt_path_offset(blob, "/aliases");
if (nodeoffset >= 0) { if (nodeoffset >= 0) {
#if defined(CONFIG_HAS_ETH0) #if defined(CONFIG_HAS_ETH0)
/* fixup UCC 1 if using rgmii-id mode */ /* fixup UCC 1 if using rgmii-id mode */
path = fdt_getprop(blob, nodeoffset, "ethernet0", NULL); path = fdt_getprop(blob, nodeoffset, "ethernet0", NULL);
if (path) { if (path) {
prop = fdt_getprop(blob, nodeoffset, path = fdt_path_offset(blob, path);
"phy-connection-type", 0); prop = fdt_getprop(blob, path,
"phy-connection-type", 0);
if (prop && (strcmp(prop, "rgmii-id") == 0)) if (prop && (strcmp(prop, "rgmii-id") == 0))
fdt_setprop(blob, nodeoffset, "phy-connection-type", fdt_setprop(blob, path,
"rgmii-rxid", sizeof("rgmii-rxid")); "phy-connection-type",
"rgmii-rxid",
sizeof("rgmii-rxid"));
} }
#endif #endif
#if defined(CONFIG_HAS_ETH1) #if defined(CONFIG_HAS_ETH1)
/* fixup UCC 2 if using rgmii-id mode */ /* fixup UCC 2 if using rgmii-id mode */
path = fdt_getprop(blob, nodeoffset, "ethernet1", NULL); path = fdt_getprop(blob, nodeoffset, "ethernet1", NULL);
if (path) { if (path) {
prop = fdt_getprop(blob, nodeoffset, path = fdt_path_offset(blob, path);
"phy-connection-type", 0); prop = fdt_getprop(blob, path,
"phy-connection-type", 0);
if (prop && (strcmp(prop, "rgmii-id") == 0)) if (prop && (strcmp(prop, "rgmii-id") == 0))
fdt_setprop(blob, nodeoffset, "phy-connection-type", fdt_setprop(blob, path,
"rgmii-rxid", sizeof("rgmii-rxid")); "phy-connection-type",
"rgmii-rxid",
sizeof("rgmii-rxid"));
} }
#endif #endif
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment