[PATCH v4 4/7] net: pch_gbe: Add device tree support
flat view
STALE3423d
From: Paul Burton <hidden>
Date: 2017-06-05 17:33:20
Also in:
linux-mips
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Revision v4 of 2 in this series.
Revisions (2)
- v3 [diff vs current]
- v4 current
Introduce support for retrieving the PHY reset GPIO from device tree, which will be used on the MIPS Boston development board. This requires support for probe deferral in order to work correctly, since the order of device probe is not guaranteed & typically the EG20T GPIO controller device will be probed after the ethernet MAC. Signed-off-by: Paul Burton <redacted> Cc: David S. Miller <davem@davemloft.net> Cc: Eric Dumazet <redacted> Cc: Jarod Wilson <redacted> Cc: Tobias Klauser <tklauser@distanz.ch> Cc: linux-mips@linux-mips.org Cc: netdev@vger.kernel.org --- Changes in v4: - Use ERR_CAST(), thanks kbuild test robot/Fengguang! Changes in v3: None Changes in v2: - Tidy up handling of parsing private data, drop err_out. .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 31 +++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)
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 cb9b904786e4..b9d8504eb09c 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@@ -23,6 +23,8 @@ #include <linux/net_tstamp.h> #include <linux/ptp_classify.h> #include <linux/gpio.h> +#include <linux/gpio/consumer.h> +#include <linux/of_gpio.h> #define DRV_VERSION "1.01" const char pch_driver_version[] = DRV_VERSION;
@@ -2565,13 +2567,40 @@ static void pch_gbe_remove(struct pci_dev *pdev) free_netdev(netdev); } +static struct pch_gbe_privdata * +pch_gbe_get_priv(struct pci_dev *pdev, const struct pci_device_id *pci_id) +{ + struct pch_gbe_privdata *pdata; + struct gpio_desc *gpio; + + if (!IS_ENABLED(CONFIG_OF)) + return (struct pch_gbe_privdata *)pci_id->driver_data; + + pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return ERR_PTR(-ENOMEM); + + gpio = devm_gpiod_get(&pdev->dev, "phy-reset", GPIOD_ASIS); + if (!IS_ERR(gpio)) + pdata->phy_reset_gpio = gpio; + else if (PTR_ERR(gpio) != -ENOENT) + return ERR_CAST(gpio); + + return pdata; +} + static int pch_gbe_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) { struct net_device *netdev; struct pch_gbe_adapter *adapter; + struct pch_gbe_privdata *pdata; int ret; + pdata = pch_gbe_get_priv(pdev, pci_id); + if (IS_ERR(pdata)) + return PTR_ERR(pdata); + ret = pcim_enable_device(pdev); if (ret) return ret;
@@ -2609,7 +2638,7 @@ static int pch_gbe_probe(struct pci_dev *pdev, adapter->pdev = pdev; adapter->hw.back = adapter; adapter->hw.reg = pcim_iomap_table(pdev)[PCH_GBE_PCI_BAR]; - adapter->pdata = (struct pch_gbe_privdata *)pci_id->driver_data; + adapter->pdata = pdata; if (adapter->pdata && adapter->pdata->platform_init) adapter->pdata->platform_init(pdev, adapter->pdata);
--
2.13.0