diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-06-21 12:04:27 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-06-21 12:04:27 +0200 |
| commit | d8859eccecd66b01c10a89755a26f407a1280601 (patch) | |
| tree | cdae1b5185275aaae4a13968c73b689e00973658 /drivers/pci | |
| parent | cdde8d7bf0fb419aca205875dce8cdcdb0bad261 (diff) | |
Revert "pcie-imx6: add reset function for reseting downstream EP"
Rely on mainline mechanism.
This reverts commit 7a376c99fbda16402bedb9bf9a09c1c84bf899f8.
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/dwc/pci-imx6.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/pci/dwc/pci-imx6.c b/drivers/pci/dwc/pci-imx6.c index 0adce8fa8454..54459b52f526 100644 --- a/drivers/pci/dwc/pci-imx6.c +++ b/drivers/pci/dwc/pci-imx6.c @@ -75,7 +75,6 @@ struct imx_pcie { int power_on_gpio; int reset_gpio; bool gpio_active_high; - int reset_ep_gpio; struct clk *pcie_bus; struct clk *pcie_phy; struct clk *pcie_inbound_axi; @@ -957,16 +956,11 @@ static int imx_pcie_deassert_core_reset(struct imx_pcie *imx_pcie) /* Some boards don't have PCIe reset GPIO. */ if (gpio_is_valid(imx_pcie->reset_gpio)) { - if (gpio_is_valid(imx_pcie->reset_ep_gpio)) - gpio_set_value_cansleep(imx_pcie->reset_ep_gpio, 1); gpio_set_value_cansleep(imx_pcie->reset_gpio, imx_pcie->gpio_active_high); mdelay(20); gpio_set_value_cansleep(imx_pcie->reset_gpio, !imx_pcie->gpio_active_high); - mdelay(1); - if (gpio_is_valid(imx_pcie->reset_ep_gpio)) - gpio_set_value_cansleep(imx_pcie->reset_ep_gpio, 0); mdelay(20); } @@ -2364,17 +2358,6 @@ static int imx_pcie_probe(struct platform_device *pdev) } else if (imx_pcie->dis_gpio == -EPROBE_DEFER) { return imx_pcie->dis_gpio; } - imx_pcie->reset_ep_gpio = of_get_named_gpio(node, "reset-ep-gpio", 0); - if (gpio_is_valid(imx_pcie->reset_ep_gpio)) { - ret = devm_gpio_request_one(&pdev->dev, - imx_pcie->reset_ep_gpio, - GPIOF_OUT_INIT_HIGH, - "PCIe EP reset"); - if (ret) { - dev_err(&pdev->dev, "unable to get reset end point gpio\n"); - return ret; - } - } imx_pcie->power_on_gpio = of_get_named_gpio(node, "power-on-gpio", 0); if (gpio_is_valid(imx_pcie->power_on_gpio)) { |