| Message ID | 20180510231657.28503-4-paul.burton@mips.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: pch_gbe: MIPS support | expand |
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index b20ed110cdef..f491044c2739 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -25,6 +25,7 @@ #include <linux/gpio.h> #include <linux/gpio/consumer.h> #include <linux/at803x_phy.h> +#include <linux/of_mdio.h> #define DRV_VERSION "1.01" const char pch_driver_version[] = DRV_VERSION; @@ -829,6 +830,9 @@ static int pch_gbe_init_mdio(struct pch_gbe_adapter *adapter) adapter->mdiobus = bus; + if (dev->of_node) + return of_mdiobus_register(bus, dev->of_node); + return mdiobus_register(bus); }
When running on a system which uses device tree, use of_mdiobus_register() rather than plain mdiobus_register() in order to support parsing PHY information from the DT. On systems without CONFIG_OF_MDIO set of_mdiobus_register() falls back to mdiobus_register() anyway, but here we check for a non-NULL device node in order to continue functioning as-is if a system has CONFIG_OF_MDIO=y but doesn't use the devicetree. Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: Andrew Lunn <andrew@lunn.ch> Cc: David S. Miller <davem@davemloft.net> Cc: linux-mips@linux-mips.org Cc: netdev@vger.kernel.org --- Changes in v6: - New patch, significantly simplified by Andrew's preceding patches. Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 4 ++++ 1 file changed, 4 insertions(+)