From 826486c65363059986fa12fa1eeb7c0e50c3af48 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Wed, 6 Jan 2016 15:44:07 +0100 Subject: PCI: imx6: fix PCIe EP device self-initialisation This fixes PCIe EP device self-initialisation in case only a regular reset EP GPIO is used as PERST# which is e.g. the case on our Ixora carrier board by always waiting 20 milliseconds after releasing PERST#. Signed-off-by: Marcel Ziswiler Acked-by: Max Krummenacher (cherry picked from commit 3eaf56fc694e8b960a29e0205f40380cf59f9fc9) --- drivers/pci/host/pci-imx6.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c index cad18fc37261..143779cd7e98 100644 --- a/drivers/pci/host/pci-imx6.c +++ b/drivers/pci/host/pci-imx6.c @@ -431,13 +431,12 @@ static int imx6_pcie_deassert_core_reset(struct pcie_port *pp) mdelay(1); if (gpio_is_valid(imx6_pcie->reset_ep_gpio)) gpio_set_value_cansleep(imx6_pcie->reset_ep_gpio, 0); - mdelay(20); } else if (gpio_is_valid(imx6_pcie->reset_ep_gpio)) { gpio_set_value_cansleep(imx6_pcie->reset_ep_gpio, 1); mdelay(100); gpio_set_value_cansleep(imx6_pcie->reset_ep_gpio, 0); - mdelay(20); } + mdelay(20); /* * Release the PCIe PHY reset here */ -- cgit v1.2.3