diff options
Diffstat (limited to 'drivers/pci/dwc/pci-imx6.c')
-rw-r--r-- | drivers/pci/dwc/pci-imx6.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/pci/dwc/pci-imx6.c b/drivers/pci/dwc/pci-imx6.c index bf5c3616e344..b73483534a5b 100644 --- a/drivers/pci/dwc/pci-imx6.c +++ b/drivers/pci/dwc/pci-imx6.c | |||
@@ -636,7 +636,7 @@ err_reset_phy: | |||
636 | return ret; | 636 | return ret; |
637 | } | 637 | } |
638 | 638 | ||
639 | static void imx6_pcie_host_init(struct pcie_port *pp) | 639 | static int imx6_pcie_host_init(struct pcie_port *pp) |
640 | { | 640 | { |
641 | struct dw_pcie *pci = to_dw_pcie_from_pp(pp); | 641 | struct dw_pcie *pci = to_dw_pcie_from_pp(pp); |
642 | struct imx6_pcie *imx6_pcie = to_imx6_pcie(pci); | 642 | struct imx6_pcie *imx6_pcie = to_imx6_pcie(pci); |
@@ -649,6 +649,8 @@ static void imx6_pcie_host_init(struct pcie_port *pp) | |||
649 | 649 | ||
650 | if (IS_ENABLED(CONFIG_PCI_MSI)) | 650 | if (IS_ENABLED(CONFIG_PCI_MSI)) |
651 | dw_pcie_msi_init(pp); | 651 | dw_pcie_msi_init(pp); |
652 | |||
653 | return 0; | ||
652 | } | 654 | } |
653 | 655 | ||
654 | static int imx6_pcie_link_up(struct dw_pcie *pci) | 656 | static int imx6_pcie_link_up(struct dw_pcie *pci) |
@@ -778,14 +780,15 @@ static int imx6_pcie_probe(struct platform_device *pdev) | |||
778 | } | 780 | } |
779 | break; | 781 | break; |
780 | case IMX7D: | 782 | case IMX7D: |
781 | imx6_pcie->pciephy_reset = devm_reset_control_get(dev, | 783 | imx6_pcie->pciephy_reset = devm_reset_control_get_exclusive(dev, |
782 | "pciephy"); | 784 | "pciephy"); |
783 | if (IS_ERR(imx6_pcie->pciephy_reset)) { | 785 | if (IS_ERR(imx6_pcie->pciephy_reset)) { |
784 | dev_err(dev, "Failed to get PCIEPHY reset control\n"); | 786 | dev_err(dev, "Failed to get PCIEPHY reset control\n"); |
785 | return PTR_ERR(imx6_pcie->pciephy_reset); | 787 | return PTR_ERR(imx6_pcie->pciephy_reset); |
786 | } | 788 | } |
787 | 789 | ||
788 | imx6_pcie->apps_reset = devm_reset_control_get(dev, "apps"); | 790 | imx6_pcie->apps_reset = devm_reset_control_get_exclusive(dev, |
791 | "apps"); | ||
789 | if (IS_ERR(imx6_pcie->apps_reset)) { | 792 | if (IS_ERR(imx6_pcie->apps_reset)) { |
790 | dev_err(dev, "Failed to get PCIE APPS reset control\n"); | 793 | dev_err(dev, "Failed to get PCIE APPS reset control\n"); |
791 | return PTR_ERR(imx6_pcie->apps_reset); | 794 | return PTR_ERR(imx6_pcie->apps_reset); |