|
@@ -316,15 +316,15 @@ void ft_board_setup(void *blob, bd_t *bd)
|
|
immr->sysconf.spridr == SPR_8360E_REV21) {
|
|
immr->sysconf.spridr == SPR_8360E_REV21) {
|
|
int nodeoffset;
|
|
int nodeoffset;
|
|
const char *prop;
|
|
const char *prop;
|
|
- const char *path;
|
|
|
|
|
|
+ int path;
|
|
|
|
|
|
nodeoffset = fdt_path_offset(blob, "/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);
|
|
|
|
- if (path) {
|
|
|
|
- path = fdt_path_offset(blob, path);
|
|
|
|
|
|
+ prop = fdt_getprop(blob, nodeoffset, "ethernet0", NULL);
|
|
|
|
+ if (prop) {
|
|
|
|
+ path = fdt_path_offset(blob, prop);
|
|
prop = fdt_getprop(blob, path,
|
|
prop = fdt_getprop(blob, path,
|
|
"phy-connection-type", 0);
|
|
"phy-connection-type", 0);
|
|
if (prop && (strcmp(prop, "rgmii-id") == 0))
|
|
if (prop && (strcmp(prop, "rgmii-id") == 0))
|
|
@@ -336,9 +336,9 @@ void ft_board_setup(void *blob, bd_t *bd)
|
|
#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);
|
|
|
|
- if (path) {
|
|
|
|
- path = fdt_path_offset(blob, path);
|
|
|
|
|
|
+ prop = fdt_getprop(blob, nodeoffset, "ethernet1", NULL);
|
|
|
|
+ if (prop) {
|
|
|
|
+ path = fdt_path_offset(blob, prop);
|
|
prop = fdt_getprop(blob, path,
|
|
prop = fdt_getprop(blob, path,
|
|
"phy-connection-type", 0);
|
|
"phy-connection-type", 0);
|
|
if (prop && (strcmp(prop, "rgmii-id") == 0))
|
|
if (prop && (strcmp(prop, "rgmii-id") == 0))
|