diff --git a/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c b/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c
index 1725e7d0d95813c0e0dcf8f1b0a6fe132c8de52f..fbb4353624d385c6da7663cb1f53114407d3292a 100644
--- a/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c
+++ b/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c
@@ -161,7 +161,7 @@ static int n1sdp_pcie_setup(struct n1sdp_pcie_dev_ctx *dev_ctx)
                        PCIE_INIT_STAGE_LINK_TRNG);
     if (status != FWK_SUCCESS) {
         pcie_ctx.log_api->log(MOD_LOG_GROUP_INFO, "Timeout!\n");
-        return status;
+        return dev_ctx->config->ccix_capable ? FWK_SUCCESS : status;
     }
     pcie_ctx.log_api->log(MOD_LOG_GROUP_INFO, "Done\n");
 
diff --git a/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.h b/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.h
index 047fcc54bd79a2fd7f6eef579f9e4f023ec26e38..73e668dc4c3bcdff80c7b81e037d69da72e8fd9d 100644
--- a/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.h
+++ b/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.h
@@ -128,7 +128,7 @@
 /*
  * CCIX AXI slave ECAM memory mapping
  */
-#define CCIX_AXI_ECAM_TYPE0_OFFSET     (32 * FWK_MIB)
+#define CCIX_AXI_ECAM_TYPE0_OFFSET     UINT32_C(0)
 
 #define CCIX_AXI_ECAM_TYPE1_OFFSET     (CCIX_AXI_ECAM_TYPE0_OFFSET + \
                                            AXI_ECAM_TYPE0_SIZE)
@@ -142,7 +142,8 @@
 /* CCIX AXI slave MMIO32 & IO offset addresses */
 #define CCIX_AXI_MMIO32_OFFSET         (CCIX_AXI_ECAM_TYPE1_OFFSET + \
                                             AXI_ECAM_TYPE1_SIZE)
-#define CCIX_AXI_IO_OFFSET             UINT32_C(0)
+#define CCIX_AXI_IO_OFFSET             (CCIX_AXI_MMIO32_OFFSET + \
+                                            AXI_MMIO32_SIZE)
 
 /* AXI inbound region data */
 #define AXI_IB_REGION_BASE             UINT64_C(0)