mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three sets of overlapping changes, two in the packet scheduler and one in the meson-gxl PHY driver. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
c30abd5e40
446 changed files with 2942 additions and 3463 deletions
|
|
@ -85,6 +85,7 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio,
|
|||
* can be looked up later */
|
||||
of_node_get(child);
|
||||
phy->mdio.dev.of_node = child;
|
||||
phy->mdio.dev.fwnode = of_fwnode_handle(child);
|
||||
|
||||
/* All data is now stored in the phy struct;
|
||||
* register it */
|
||||
|
|
@ -115,6 +116,7 @@ static int of_mdiobus_register_device(struct mii_bus *mdio,
|
|||
*/
|
||||
of_node_get(child);
|
||||
mdiodev->dev.of_node = child;
|
||||
mdiodev->dev.fwnode = of_fwnode_handle(child);
|
||||
|
||||
/* All data is now stored in the mdiodev struct; register it. */
|
||||
rc = mdio_device_register(mdiodev);
|
||||
|
|
@ -210,6 +212,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
|
|||
mdio->phy_mask = ~0;
|
||||
|
||||
mdio->dev.of_node = np;
|
||||
mdio->dev.fwnode = of_fwnode_handle(np);
|
||||
|
||||
/* Get bus level PHY reset GPIO details */
|
||||
mdio->reset_delay_us = DEFAULT_GPIO_RESET_DELAY;
|
||||
|
|
|
|||
Loading…
Reference in a new issue