From patchwork Mon Jun 5 17:31:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Burton X-Patchwork-Id: 771371 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 3whMNq6y5Vz9s0m for ; Tue, 6 Jun 2017 03:33:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751921AbdFERdV (ORCPT ); Mon, 5 Jun 2017 13:33:21 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:46059 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751879AbdFERdU (ORCPT ); Mon, 5 Jun 2017 13:33:20 -0400 Received: from hhmail02.hh.imgtec.org (unknown [10.100.10.20]) by Forcepoint Email with ESMTPS id ECFB3743A1184; Mon, 5 Jun 2017 18:33:13 +0100 (IST) Received: from localhost (10.20.1.33) by hhmail02.hh.imgtec.org (10.100.10.21) with Microsoft SMTP Server (TLS) id 14.3.294.0; Mon, 5 Jun 2017 18:33:17 +0100 From: Paul Burton To: CC: "David S . Miller" , , Eric Dumazet , Jarod Wilson , Tobias Klauser , Paul Burton Subject: [PATCH v4 4/7] net: pch_gbe: Add device tree support Date: Mon, 5 Jun 2017 10:31:33 -0700 Message-ID: <20170605173136.10795-5-paul.burton@imgtec.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170605173136.10795-1-paul.burton@imgtec.com> References: <20170602234042.22782-1-paul.burton@imgtec.com> <20170605173136.10795-1-paul.burton@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [10.20.1.33] 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 Cc: David S. Miller Cc: Eric Dumazet Cc: Jarod Wilson Cc: Tobias Klauser 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 #include #include +#include +#include #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);