fsl_soc.c (c58310bf4933986513020fa90b4190c7492995ae) | fsl_soc.c (9d9326d3bc0ea9a8bbe40bf3e5e66c7b9858caa0) |
---|---|
1/* 2 * FSL SoC setup code 3 * 4 * Maintained by Kumar Gala (see MAINTAINERS for contact information) 5 * 6 * 2006 (c) MontaVista Software, Inc. 7 * Vitaly Bordug <vbordug@ru.mvista.com> 8 * --- 327 unchanged lines hidden (view full) --- 336 337 fixed_link = (u32 *)of_get_property(np, "fixed-link", 338 NULL); 339 if (!fixed_link) { 340 ret = -ENODEV; 341 goto unreg; 342 } 343 | 1/* 2 * FSL SoC setup code 3 * 4 * Maintained by Kumar Gala (see MAINTAINERS for contact information) 5 * 6 * 2006 (c) MontaVista Software, Inc. 7 * Vitaly Bordug <vbordug@ru.mvista.com> 8 * --- 327 unchanged lines hidden (view full) --- 336 337 fixed_link = (u32 *)of_get_property(np, "fixed-link", 338 NULL); 339 if (!fixed_link) { 340 ret = -ENODEV; 341 goto unreg; 342 } 343 |
344 gfar_data.bus_id = 0; | 344 snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "0"); |
345 gfar_data.phy_id = fixed_link[0]; 346 } else { 347 phy = of_find_node_by_phandle(*ph); 348 349 if (phy == NULL) { 350 ret = -ENODEV; 351 goto unreg; 352 } --- 4 unchanged lines hidden (view full) --- 357 ret = of_address_to_resource(mdio, 0, &res); 358 if (ret) { 359 of_node_put(phy); 360 of_node_put(mdio); 361 goto unreg; 362 } 363 364 gfar_data.phy_id = *id; | 345 gfar_data.phy_id = fixed_link[0]; 346 } else { 347 phy = of_find_node_by_phandle(*ph); 348 349 if (phy == NULL) { 350 ret = -ENODEV; 351 goto unreg; 352 } --- 4 unchanged lines hidden (view full) --- 357 ret = of_address_to_resource(mdio, 0, &res); 358 if (ret) { 359 of_node_put(phy); 360 of_node_put(mdio); 361 goto unreg; 362 } 363 364 gfar_data.phy_id = *id; |
365 gfar_data.bus_id = res.start; | 365 snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "%x", 366 res.start); |
366 367 of_node_put(phy); 368 of_node_put(mdio); 369 } 370 371 ret = 372 platform_device_add_data(gfar_dev, &gfar_data, 373 sizeof(struct --- 1067 unchanged lines hidden --- | 367 368 of_node_put(phy); 369 of_node_put(mdio); 370 } 371 372 ret = 373 platform_device_add_data(gfar_dev, &gfar_data, 374 sizeof(struct --- 1067 unchanged lines hidden --- |