From patchwork Wed Feb 3 12:02:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Burton X-Patchwork-Id: 577882 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8498C1402C4 for ; Wed, 3 Feb 2016 23:04:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756436AbcBCMEV (ORCPT ); Wed, 3 Feb 2016 07:04:21 -0500 Received: from mailapp01.imgtec.com ([195.59.15.196]:61834 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753257AbcBCMET (ORCPT ); Wed, 3 Feb 2016 07:04:19 -0500 Received: from HHMAIL01.hh.imgtec.org (unknown [10.100.10.19]) by Websense Email Security Gateway with ESMTPS id 3C71D79541927; Wed, 3 Feb 2016 12:04:15 +0000 (GMT) Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by HHMAIL01.hh.imgtec.org (10.100.10.19) with Microsoft SMTP Server (TLS) id 14.3.266.1; Wed, 3 Feb 2016 12:04:17 +0000 Received: from localhost (10.100.200.105) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.210.2; Wed, 3 Feb 2016 12:04:16 +0000 From: Paul Burton To: , Ralf Baechle CC: Paul Burton , , Subject: [PATCH v2 5/6] net: pch_gbe: Add device tree support Date: Wed, 3 Feb 2016 12:02:43 +0000 Message-ID: <1454500964-6256-6-git-send-email-paul.burton@imgtec.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454500964-6256-1-git-send-email-paul.burton@imgtec.com> References: <1454500964-6256-1-git-send-email-paul.burton@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [10.100.200.105] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- Changes in v2: - Tidy up handling of parsing private data, drop err_out. .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 30 +++++++++++++++++++++- 1 file changed, 29 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 824ff9e..00ef83c 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 #include #include +#include +#include #define DRV_VERSION "1.01" const char pch_driver_version[] = DRV_VERSION; @@ -2594,13 +2596,39 @@ 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 (!config_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)) + return ERR_PTR(PTR_ERR(gpio)); + pdata->phy_reset_gpio = 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; @@ -2638,7 +2666,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, pdata);