3 files changed, 8 insertions, 13 deletions

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index c0867df090f5..eeacdebd9b50 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -103,8 +103,6 @@ struct imx6_pcie {
 
 /* PCIe Port Logic registers (memory-mapped) */
 #define PL_OFFSET 0x700
-#define PCIE_PHY_DEBUG_R0 (PL_OFFSET + 0x28)
-#define PCIE_PHY_DEBUG_R1 (PL_OFFSET + 0x2c)
 
 #define PCIE_PHY_CTRL (PL_OFFSET + 0x114)
 #define PCIE_PHY_CTRL_DATA_LOC 0
@@ -831,8 +829,8 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
 
 err_reset_phy:
         dev_dbg(dev, "PHY DEBUG_R0=0x%08x DEBUG_R1=0x%08x\n",
-                dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R0),
-                dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R1));
+                dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG0),
+                dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG1));
         imx6_pcie_reset_phy(imx6_pcie);
         return ret;
 }
diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c
index 31f6331ca46f..086e87a40316 100644
--- a/drivers/pci/controller/dwc/pcie-designware.c
+++ b/drivers/pci/controller/dwc/pcie-designware.c
@@ -14,12 +14,6 @@
 
 #include "pcie-designware.h"
 
-/* PCIe Port Logic registers */
-#define PLR_OFFSET                      0x700
-#define PCIE_PHY_DEBUG_R1               (PLR_OFFSET + 0x2c)
-#define PCIE_PHY_DEBUG_R1_LINK_UP       (0x1 << 4)
-#define PCIE_PHY_DEBUG_R1_LINK_IN_TRAINING      (0x1 << 29)
-
 int dw_pcie_read(void __iomem *addr, int size, u32 *val)
 {
         if (!IS_ALIGNED((uintptr_t)addr, size)) {
@@ -334,9 +328,9 @@ int dw_pcie_link_up(struct dw_pcie *pci)
         if (pci->ops->link_up)
                 return pci->ops->link_up(pci);
 
-        val = readl(pci->dbi_base + PCIE_PHY_DEBUG_R1);
-        return ((val & PCIE_PHY_DEBUG_R1_LINK_UP) &&
-                (!(val & PCIE_PHY_DEBUG_R1_LINK_IN_TRAINING)));
+        val = readl(pci->dbi_base + PCIE_PORT_DEBUG1);
+        return ((val & PCIE_PORT_DEBUG1_LINK_UP) &&
+                (!(val & PCIE_PORT_DEBUG1_LINK_IN_TRAINING)));
 }
 
 void dw_pcie_setup(struct dw_pcie *pci)
diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
index 377f4c0b52da..b33ae13194be 100644
--- a/drivers/pci/controller/dwc/pcie-designware.h
+++ b/drivers/pci/controller/dwc/pcie-designware.h
@@ -41,6 +41,9 @@
 #define PCIE_PORT_DEBUG0                0x728
 #define PORT_LOGIC_LTSSM_STATE_MASK     0x1f
 #define PORT_LOGIC_LTSSM_STATE_L0       0x11
+#define PCIE_PORT_DEBUG1                0x72C
+#define PCIE_PORT_DEBUG1_LINK_UP                BIT(4)
+#define PCIE_PORT_DEBUG1_LINK_IN_TRAINING       BIT(29)
 
 #define PCIE_LINK_WIDTH_SPEED_CONTROL   0x80C
 #define PORT_LOGIC_SPEED_CHANGE         BIT(17)