From: Paul Burton <paul.burton@mips.com>
To: <netdev@vger.kernel.org>
Cc: <linux-mips@linux-mips.org>,
"David S . Miller" <davem@davemloft.net>,
Andrew Lunn <andrew@lunn.ch>, Paul Burton <paul.burton@mips.com>
Subject: [PATCH v6 3/6] net: pch_gbe: Support DeviceTree for MDIO/PHY description
Date: Thu, 10 May 2018 16:16:54 -0700 [thread overview]
Message-ID: <20180510231657.28503-4-paul.burton@mips.com> (raw)
In-Reply-To: <20180510231657.28503-1-paul.burton@mips.com>
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(+)
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);
}
--
2.17.0
next prev parent reply other threads:[~2018-05-10 23:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-10 23:16 [PATCH v6 0/6] net: pch_gbe: MIPS support Paul Burton
2018-05-10 23:16 ` [PATCH v6 1/6] net: phy: at803x: Export at803x_debug_reg_mask() Paul Burton
2018-05-11 0:26 ` Andrew Lunn
2018-05-11 18:25 ` Paul Burton
2018-05-11 18:38 ` Paul Burton
2018-05-11 19:24 ` Andrew Lunn
2018-05-11 22:22 ` Paul Burton
2018-05-12 21:37 ` Andrew Lunn
2018-05-10 23:16 ` [PATCH v6 2/6] net: ethernet: pch_gbe: Convert to mdiobus and phylib Paul Burton
2018-05-10 23:16 ` Paul Burton [this message]
2018-05-10 23:16 ` [PATCH v6 4/6] ptp: pch: Allow build on MIPS platforms Paul Burton
2018-05-10 23:16 ` [PATCH v6 5/6] net: pch_gbe: " Paul Burton
2018-05-10 23:16 ` [PATCH v6 6/6] MIPS: Boston: Adjust DT for pch_gbe PHY support Paul Burton
2018-05-11 0:28 ` Andrew Lunn
2018-05-11 0:35 ` Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180510231657.28503-4-paul.burton@mips.com \
--to=paul.burton@mips.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=linux-mips@linux-mips.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).