aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-09-11 08:08:53 -0400
committerBjorn Helgaas <helgaas@kernel.org>2015-09-24 18:12:57 -0400
commit111feb7f0c50a4b3369274539c27612904d33e96 (patch)
tree49620e98ca69513526031e56def0a6abfc765e1a
parent89b2d4f14b147bcb499f5e7b1c6e6ce082a58e8f (diff)
PCI: imx6: Add PCIE_PHY_RX_ASIC_OUT_VALID definition
Add a #define for PCIE_PHY_RX_ASIC_OUT_VALID and use it instead of a hardcoded value. [bhelgaas: drop PCIE_PHY_DEBUG_R0_LTSSM_MASK; updated in future patch] Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Bjorn Helgaas <helgaas@kernel.org> Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
-rw-r--r--drivers/pci/host/pci-imx6.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
index 2d0d0fe50c99..22e8224126fd 100644
--- a/drivers/pci/host/pci-imx6.c
+++ b/drivers/pci/host/pci-imx6.c
@@ -74,6 +74,7 @@ struct imx6_pcie {
74 74
75/* PHY registers (not memory-mapped) */ 75/* PHY registers (not memory-mapped) */
76#define PCIE_PHY_RX_ASIC_OUT 0x100D 76#define PCIE_PHY_RX_ASIC_OUT 0x100D
77#define PCIE_PHY_RX_ASIC_OUT_VALID (1 << 0)
77 78
78#define PHY_RX_OVRD_IN_LO 0x1005 79#define PHY_RX_OVRD_IN_LO 0x1005
79#define PHY_RX_OVRD_IN_LO_RX_DATA_EN (1 << 5) 80#define PHY_RX_OVRD_IN_LO_RX_DATA_EN (1 << 5)
@@ -503,7 +504,7 @@ static int imx6_pcie_link_up(struct pcie_port *pp)
503 pcie_phy_read(pp->dbi_base, PCIE_PHY_RX_ASIC_OUT, &rx_valid); 504 pcie_phy_read(pp->dbi_base, PCIE_PHY_RX_ASIC_OUT, &rx_valid);
504 debug_r0 = readl(pp->dbi_base + PCIE_PHY_DEBUG_R0); 505 debug_r0 = readl(pp->dbi_base + PCIE_PHY_DEBUG_R0);
505 506
506 if (rx_valid & 0x01) 507 if (rx_valid & PCIE_PHY_RX_ASIC_OUT_VALID)
507 return 0; 508 return 0;
508 509
509 if ((debug_r0 & 0x3f) != 0x0d) 510 if ((debug_r0 & 0x3f) != 0x0d)