diff --git a/board/qca/arm/ipq5018/ipq5018.c b/board/qca/arm/ipq5018/ipq5018.c
index 17c0aa7490..1b899cf7bb 100644
--- a/board/qca/arm/ipq5018/ipq5018.c
+++ b/board/qca/arm/ipq5018/ipq5018.c
@@ -71,7 +71,7 @@ extern void ppe_uniphy_refclk_set(void);
 
 unsigned int qpic_frequency = 0, qpic_phase = 0;
 
-#ifdef CONFIG_QPIC_NAND
+#ifdef CONFIG_QPIC_SERIAL
 extern unsigned int qpic_training_offset;
 #endif
 
@@ -2126,11 +2126,15 @@ void fdt_fixup_qpic(void *blob)
 		return;
 	}
 
-#ifdef CONFIG_QPIC_NAND
-	ret = fdt_setprop_u32(blob, node_off, "qcom,training_offset", qpic_training_offset);
-	if (ret) {
-		printf("%s : Unable to set property 'qcom,training_offset'\n",__func__);
-		return;
+#ifdef CONFIG_QPIC_SERIAL
+	if (qpic_training_offset != 0xBAD0FF5E){
+		ret = fdt_setprop_u32(blob, node_off, "qcom,training_offset",
+				qpic_training_offset);
+		if (ret) {
+			printf("%s : Unable to set property 'qcom,training_offset'\n",
+					__func__);
+			return;
+		}
 	}
 #endif
 }
diff --git a/board/qca/arm/ipq9574/ipq9574.c b/board/qca/arm/ipq9574/ipq9574.c
index 48b4a4fe72..bccdff321a 100644
--- a/board/qca/arm/ipq9574/ipq9574.c
+++ b/board/qca/arm/ipq9574/ipq9574.c
@@ -101,10 +101,14 @@ void fdt_fixup_qpic(void *blob)
 		return;
 	}
 
-	ret = fdt_setprop_u32(blob, node_off, "qcom,training_offset", qpic_training_offset);
-	if (ret) {
-		printf("%s : Unable to set property 'qcom,training_offset'\n",__func__);
-		return;
+	if (qpic_training_offset != 0xBAD0FF5E){
+		ret = fdt_setprop_u32(blob, node_off, "qcom,training_offset",
+			qpic_training_offset);
+		if (ret) {
+			printf("%s : Unable to set property 'qcom,training_offset'\n",
+					__func__);
+			return;
+		}
 	}
 }
 
diff --git a/drivers/mtd/nand/qpic_nand.c b/drivers/mtd/nand/qpic_nand.c
index fc36f45c35..04f18bfe39 100644
--- a/drivers/mtd/nand/qpic_nand.c
+++ b/drivers/mtd/nand/qpic_nand.c
@@ -47,7 +47,7 @@ struct nand_onfi_para_page onfi_para;
 typedef unsigned long addr_t;
 
 static uint32_t hw_ver;
-unsigned int qpic_training_offset = 0;
+unsigned int qpic_training_offset = 0xBAD0FF5E;
 
 #ifdef CONFIG_QSPI_LAYOUT_SWITCH
 enum qpic_nand_layout {