|
|
@@ -202,6 +202,23 @@ static int pcie_phy_write(void __iomem *dbi_base, int addr, int data)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static void imx6_pcie_reset_phy(struct pcie_port *pp)
|
|
|
+{
|
|
|
+ u32 tmp;
|
|
|
+
|
|
|
+ pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &tmp);
|
|
|
+ tmp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN |
|
|
|
+ PHY_RX_OVRD_IN_LO_RX_PLL_EN);
|
|
|
+ pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, tmp);
|
|
|
+
|
|
|
+ usleep_range(2000, 3000);
|
|
|
+
|
|
|
+ pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &tmp);
|
|
|
+ tmp &= ~(PHY_RX_OVRD_IN_LO_RX_DATA_EN |
|
|
|
+ PHY_RX_OVRD_IN_LO_RX_PLL_EN);
|
|
|
+ pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, tmp);
|
|
|
+}
|
|
|
+
|
|
|
/* Added for PCI abort handling */
|
|
|
static int imx6q_pcie_abort_handler(unsigned long addr,
|
|
|
unsigned int fsr, struct pt_regs *regs)
|
|
|
@@ -441,23 +458,6 @@ static void imx6_pcie_host_init(struct pcie_port *pp)
|
|
|
dw_pcie_msi_init(pp);
|
|
|
}
|
|
|
|
|
|
-static void imx6_pcie_reset_phy(struct pcie_port *pp)
|
|
|
-{
|
|
|
- u32 tmp;
|
|
|
-
|
|
|
- pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &tmp);
|
|
|
- tmp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN |
|
|
|
- PHY_RX_OVRD_IN_LO_RX_PLL_EN);
|
|
|
- pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, tmp);
|
|
|
-
|
|
|
- usleep_range(2000, 3000);
|
|
|
-
|
|
|
- pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &tmp);
|
|
|
- tmp &= ~(PHY_RX_OVRD_IN_LO_RX_DATA_EN |
|
|
|
- PHY_RX_OVRD_IN_LO_RX_PLL_EN);
|
|
|
- pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, tmp);
|
|
|
-}
|
|
|
-
|
|
|
static int imx6_pcie_link_up(struct pcie_port *pp)
|
|
|
{
|
|
|
u32 rc, debug_r0, rx_valid;
|