2 files changed, 7 insertions, 8 deletions

diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
index 2decbaec81a3..e181e6277323 100644
--- a/drivers/pci/controller/dwc/pci-keystone.c
+++ b/drivers/pci/controller/dwc/pci-keystone.c
@@ -38,8 +38,6 @@
 
 /* Application register defines */
 #define LTSSM_EN_VAL                    BIT(0)
-#define LTSSM_STATE_MASK                0x1f
-#define LTSSM_STATE_L0                  0x11
 #define DBI_CS2                         BIT(5)
 #define OB_XLAT_EN_VAL                  BIT(1)
 
@@ -87,11 +85,7 @@
 #define ERR_IRQ_ENABLE_SET              0x1c8
 #define ERR_IRQ_ENABLE_CLR              0x1cc
 
-/* Config space registers */
-#define DEBUG0                          0x728
-
 #define MAX_MSI_HOST_IRQS               8
-
 /* PCIE controller device IDs */
 #define PCIE_RC_K2HK            0xb008
 #define PCIE_RC_K2E             0xb009
@@ -442,8 +436,9 @@ static int ks_pcie_link_up(struct dw_pcie *pci)
 {
         u32 val;
 
-        val = dw_pcie_readl_dbi(pci, DEBUG0);
-        return (val & LTSSM_STATE_MASK) == LTSSM_STATE_L0;
+        val = dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG0);
+        val &= PORT_LOGIC_LTSSM_STATE_MASK;
+        return (val == PORT_LOGIC_LTSSM_STATE_L0);
 }
 
 static void ks_pcie_initiate_link_train(struct keystone_pcie *ks_pcie)
diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
index 96126fd8403c..a4d939536faf 100644
--- a/drivers/pci/controller/dwc/pcie-designware.h
+++ b/drivers/pci/controller/dwc/pcie-designware.h
@@ -37,6 +37,10 @@
 #define PORT_LINK_MODE_4_LANES          (0x7 << 16)
 #define PORT_LINK_MODE_8_LANES          (0xf << 16)
 
+#define PCIE_PORT_DEBUG0                0x728
+#define PORT_LOGIC_LTSSM_STATE_MASK     0x1f
+#define PORT_LOGIC_LTSSM_STATE_L0       0x11
+
 #define PCIE_LINK_WIDTH_SPEED_CONTROL   0x80C
 #define PORT_LOGIC_SPEED_CHANGE         (0x1 << 17)
 #define PORT_LOGIC_LINK_WIDTH_MASK      (0x1f << 8)