Commit 2ba5991f authored by Shawn Lin's avatar Shawn Lin Committed by Bjorn Helgaas
Browse files

PCI: rockchip: Factor out rockchip_pcie_get_phys() 



We plan to introduce per-lane PHYs, so factor out rockchip_pcie_get_phys()
to make it easier in the future.  No functional change intended.

Tested-by: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarBrian Norris <briannorris@chromium.org>
Acked-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent b6502e0d

drivers/pci/host/pcie-rockchip.c

+16 −6
Original line number Diff line number Diff line
@@ -854,6 +854,19 @@ static void rockchip_pcie_legacy_int_handler(struct irq_desc *desc) 
	chained_irq_exit(chip, desc);

}



static int rockchip_pcie_get_phys(struct rockchip_pcie *rockchip)

{

	struct device *dev = rockchip->dev;



	rockchip->phy = devm_phy_get(dev, "pcie-phy");

	if (IS_ERR(rockchip->phy)) {

		if (PTR_ERR(rockchip->phy) != -EPROBE_DEFER)

			dev_err(dev, "missing phy\n");

		return PTR_ERR(rockchip->phy);

	}



	return 0;

}



/**

 * rockchip_pcie_parse_dt - Parse Device Tree
@@ -884,12 +897,9 @@ static int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) 
	if (IS_ERR(rockchip->apb_base))

		return PTR_ERR(rockchip->apb_base);



	rockchip->phy = devm_phy_get(dev, "pcie-phy");

	if (IS_ERR(rockchip->phy)) {

		if (PTR_ERR(rockchip->phy) != -EPROBE_DEFER)

			dev_err(dev, "missing phy\n");

		return PTR_ERR(rockchip->phy);

	}

	err = rockchip_pcie_get_phys(rockchip);

	if (err)

		return err;



	rockchip->lanes = 1;

	err = of_property_read_u32(node, "num-lanes", &rockchip->lanes);