From patchwork Thu Oct 15 14:25:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: WingMan Kwok X-Patchwork-Id: 530732 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 676B41402BC for ; Fri, 16 Oct 2015 01:27:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751684AbbJOO1U (ORCPT ); Thu, 15 Oct 2015 10:27:20 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:43119 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751244AbbJOO1S (ORCPT ); Thu, 15 Oct 2015 10:27:18 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id t9FEQWY5027545; Thu, 15 Oct 2015 09:26:32 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id t9FEQW1m031648; Thu, 15 Oct 2015 09:26:32 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Thu, 15 Oct 2015 09:26:32 -0500 Received: from udb0216549.am.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id t9FEQVZJ004730; Thu, 15 Oct 2015 09:26:32 -0500 Received: from a0216549local by udb0216549.am.dhcp.ti.com with local (Exim 4.76) (envelope-from ) id 1ZmjUF-00082J-Oj; Thu, 15 Oct 2015 10:26:31 -0400 From: WingMan Kwok To: , , , , , , , , , , , , , , CC: WingMan Kwok Subject: [PATCH v1 2/2] PCI: keystone: update to use generic keystone serdes driver Date: Thu, 15 Oct 2015 10:25:45 -0400 Message-ID: <1444919145-30845-3-git-send-email-w-kwok2@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1444919145-30845-1-git-send-email-w-kwok2@ti.com> References: <1444919145-30845-1-git-send-email-w-kwok2@ti.com> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This patch updates the Keystone PCI driver to use the generic Keystone serdes driver for serdes initialization and configuration. The generic serdes driver supports peripherals on Keystone platforms that require serdes. v1: - no change. Signed-off-by: WingMan Kwok --- drivers/pci/host/pci-keystone.c | 54 ++++++++++++++++++++++++++++++++------- drivers/pci/host/pci-keystone.h | 2 ++ 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c index 0aa81bd..b4de05b 100644 --- a/drivers/pci/host/pci-keystone.c +++ b/drivers/pci/host/pci-keystone.c @@ -335,6 +335,7 @@ static int __exit ks_pcie_remove(struct platform_device *pdev) { struct keystone_pcie *ks_pcie = platform_get_drvdata(pdev); + phy_exit(ks_pcie->serdes_phy); clk_disable_unprepare(ks_pcie->clk); return 0; @@ -342,6 +343,8 @@ static int __exit ks_pcie_remove(struct platform_device *pdev) static int __init ks_pcie_probe(struct platform_device *pdev) { + struct device_node *node = pdev->dev.of_node; + struct device_node *serdeses_np, *child; struct device *dev = &pdev->dev; struct keystone_pcie *ks_pcie; struct pcie_port *pp; @@ -349,6 +352,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev) void __iomem *reg_p; struct phy *phy; int ret = 0; + u32 phy_num; ks_pcie = devm_kzalloc(&pdev->dev, sizeof(*ks_pcie), GFP_KERNEL); @@ -357,14 +361,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev) pp = &ks_pcie->pp; - /* initialize SerDes Phy if present */ - phy = devm_phy_get(dev, "pcie-phy"); - if (!IS_ERR_OR_NULL(phy)) { - ret = phy_init(phy); - if (ret < 0) - return ret; - } - /* index 2 is to read PCI DEVICE_ID */ res = platform_get_resource(pdev, IORESOURCE_MEM, 2); reg_p = devm_ioremap_resource(dev, res); @@ -385,6 +381,46 @@ static int __init ks_pcie_probe(struct platform_device *pdev) if (ret) return ret; + serdeses_np = of_get_child_by_name(node, "serdeses"); + if (serdeses_np) { + for_each_available_child_of_node(serdeses_np, child) { + ret = of_property_read_u32(child, "reg", &phy_num); + if (ret) { + dev_err(dev, "Failed to parse device tree\n"); + of_node_put(child); + of_node_put(serdeses_np); + goto fail_clk; + } + + if (phy_num >= MAX_NUM_PCI_SERDES) { + dev_err(dev, "Invalid phy number: %u\n", + phy_num); + of_node_put(child); + of_node_put(serdeses_np); + ret = -EINVAL; + goto fail_clk; + } + + phy = devm_of_phy_get(dev, child, NULL); + of_node_put(child); + ks_pcie->serdes_phy = phy; + if (IS_ERR(phy)) { + dev_err(dev, "No %s serdes driver found: %ld\n", + node->name, PTR_ERR(phy)); + of_node_put(serdeses_np); + ret = PTR_ERR(phy); + goto fail_clk; + } + + ret = phy_init(phy); + if (ret < 0) { + of_node_put(serdeses_np); + goto fail_clk; + } + } + of_node_put(serdeses_np); + } + ret = ks_add_pcie_port(ks_pcie, pdev); if (ret < 0) goto fail_clk; @@ -392,7 +428,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev) return 0; fail_clk: clk_disable_unprepare(ks_pcie->clk); - + phy_exit(ks_pcie->serdes_phy); return ret; } diff --git a/drivers/pci/host/pci-keystone.h b/drivers/pci/host/pci-keystone.h index 478d932..21662ba 100644 --- a/drivers/pci/host/pci-keystone.h +++ b/drivers/pci/host/pci-keystone.h @@ -15,6 +15,7 @@ #define MAX_LEGACY_IRQS 4 #define MAX_MSI_HOST_IRQS 8 #define MAX_LEGACY_HOST_IRQS 4 +#define MAX_NUM_PCI_SERDES 1 struct keystone_pcie { struct clk *clk; @@ -33,6 +34,7 @@ struct keystone_pcie { /* Application register space */ void __iomem *va_app_base; struct resource app; + struct phy *serdes_phy; }; /* Keystone DW specific MSI controller APIs/definitions */