[PATCH 1/2] pci: host: pci-dra7xx: use "num-lanes" property to find phy count

[Kishon Vijay Abraham I]

use "num-lanes" property to find phy count instead of the number
phy-names property.

Signed-off-by: Kishon Vijay Abraham I <kis...@ti.com>
Signed-off-by: Sekhar Nori <nsek...@ti.com>
---
 drivers/pci/host/pci-dra7xx.c |   23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/drivers/pci/host/pci-dra7xx.c b/drivers/pci/host/pci-dra7xx.c
index 5963adc..05bbeee 100644
--- a/drivers/pci/host/pci-dra7xx.c
+++ b/drivers/pci/host/pci-dra7xx.c
@@ -70,7 +70,7 @@
 struct dra7xx_pcie {
        void __iomem            *base;
        struct phy              **phy;
-       int                     phy_count;
+       int                     lanes;
        struct device           *dev;
        struct pcie_port        pp;
 };
@@ -364,7 +364,7 @@ static int __init dra7xx_pcie_probe(struct platform_device 
*pdev)
        int ret;
        int irq;
        int i;
-       int phy_count;
+       u32 lanes;
        struct phy **phy;
        void __iomem *base;
        struct resource *res;
@@ -402,17 +402,16 @@ static int __init dra7xx_pcie_probe(struct 
platform_device *pdev)
        if (!base)
                return -ENOMEM;
 
-       phy_count = of_property_count_strings(np, "phy-names");
-       if (phy_count < 0) {
-               dev_err(dev, "unable to find the strings\n");
-               return phy_count;
+       if (of_property_read_u32(np, "num-lanes", &lanes)) {
+               dev_err(dev, "Failed to parse the number of lanes\n");
+               return -EINVAL;
        }
 
-       phy = devm_kzalloc(dev, sizeof(*phy) * phy_count, GFP_KERNEL);
+       phy = devm_kzalloc(dev, sizeof(*phy) * lanes, GFP_KERNEL);
        if (!phy)
                return -ENOMEM;
 
-       for (i = 0; i < phy_count; i++) {
+       for (i = 0; i < lanes; i++) {
                snprintf(name, sizeof(name), "pcie-phy%d", i);
                phy[i] = devm_phy_get(dev, name);
                if (IS_ERR(phy[i]))
@@ -432,7 +431,7 @@ static int __init dra7xx_pcie_probe(struct platform_device 
*pdev)
        dra7xx->base = base;
        dra7xx->phy = phy;
        dra7xx->dev = dev;
-       dra7xx->phy_count = phy_count;
+       dra7xx->lanes = lanes;
 
        pm_runtime_enable(dev);
        ret = pm_runtime_get_sync(dev);
@@ -489,7 +488,7 @@ static int __exit dra7xx_pcie_remove(struct platform_device 
*pdev)
        struct dra7xx_pcie *dra7xx = platform_get_drvdata(pdev);
        struct pcie_port *pp = &dra7xx->pp;
        struct device *dev = &pdev->dev;
-       int count = dra7xx->phy_count;
+       int count = dra7xx->lanes;
 
        if (pp->irq_domain)
                irq_domain_remove(pp->irq_domain);
@@ -535,7 +534,7 @@ static int dra7xx_pcie_resume(struct device *dev)
 static int dra7xx_pcie_suspend_noirq(struct device *dev)
 {
        struct dra7xx_pcie *dra7xx = dev_get_drvdata(dev);
-       int count = dra7xx->phy_count;
+       int count = dra7xx->lanes;
 
        while (count--) {
                phy_power_off(dra7xx->phy[count]);
@@ -548,7 +547,7 @@ static int dra7xx_pcie_suspend_noirq(struct device *dev)
 static int dra7xx_pcie_resume_noirq(struct device *dev)
 {
        struct dra7xx_pcie *dra7xx = dev_get_drvdata(dev);
-       int phy_count = dra7xx->phy_count;
+       int phy_count = dra7xx->lanes;
        int ret;
        int i;
 
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html