From 906a9aaae852126b8592cb5def5cbd7439c5052f Mon Sep 17 00:00:00 2001
From: jzlv <jzlv@bouffalolab.com>
Date: Thu, 8 Dec 2022 17:02:30 +0800
Subject: [PATCH] [fix][ef_ctrl] replace bflb_mtimer_delay_us with
 arch_delay_us

---
 drivers/lhal/include/bflb_common.h |  3 +++
 drivers/lhal/src/bflb_ef_ctrl.c    | 18 +++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/drivers/lhal/include/bflb_common.h b/drivers/lhal/include/bflb_common.h
index 8e0ca16d..4135d6a0 100644
--- a/drivers/lhal/include/bflb_common.h
+++ b/drivers/lhal/include/bflb_common.h
@@ -14,6 +14,9 @@ uint32_t *arch_memcpy4(uint32_t *dst, const uint32_t *src, uint32_t n);
 void *arch_memcpy_fast(void *pdst, const void *psrc, uint32_t n);
 uint32_t *arch_memset4(uint32_t *dst, const uint32_t val, uint32_t n);
 
+void arch_delay_us(uint32_t cnt);
+void arch_delay_ms(uint32_t cnt);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/drivers/lhal/src/bflb_ef_ctrl.c b/drivers/lhal/src/bflb_ef_ctrl.c
index 24a101ce..6b8ca819 100644
--- a/drivers/lhal/src/bflb_ef_ctrl.c
+++ b/drivers/lhal/src/bflb_ef_ctrl.c
@@ -74,7 +74,7 @@ static void ATTR_TCM_SECTION bflb_ef_ctrl_switch_ahb_clk_r0(struct bflb_device_s
     putreg32(reg_val, dev->reg_base + EF_CTRL_EF_IF_CTRL_0_OFFSET);
 
     /* Add delay for CLK to be stable */
-    bflb_mtimer_delay_us(4);
+    arch_delay_us(4);
 }
 
 /****************************************************************************/ /**
@@ -121,7 +121,7 @@ static void ATTR_TCM_SECTION bflb_ef_ctrl_switch_ahb_clk_r1(struct bflb_device_s
     putreg32(reg_val, dev->reg_base + EF_CTRL_EF_IF_CTRL_1_OFFSET);
 
     /* Add delay for CLK to be stable */
-    bflb_mtimer_delay_us(4);
+    arch_delay_us(4);
 }
 #endif
 
@@ -168,7 +168,7 @@ static void ATTR_TCM_SECTION bflb_ef_ctrl_program_efuse_r0(struct bflb_device_s
     putreg32(reg_val, dev->reg_base + EF_CTRL_EF_IF_CTRL_0_OFFSET);
 
     /* Add delay for POR to be stable */
-    bflb_mtimer_delay_us(4);
+    arch_delay_us(4);
 
     /* Trigger */
     reg_val = (EF_CTRL_EFUSE_CTRL_PROTECT) |
@@ -237,7 +237,7 @@ static void ATTR_TCM_SECTION bflb_ef_ctrl_program_efuse_r1(struct bflb_device_s
     putreg32(reg_val, dev->reg_base + EF_CTRL_EF_IF_CTRL_0_OFFSET);
 
     /* Add delay for POR to be stable */
-    bflb_mtimer_delay_us(4);
+    arch_delay_us(4);
 
     reg_val = (EF_CTRL_EFUSE_CTRL_PROTECT) |
               (EF_CTRL_OP_MODE_AUTO << EF_CTRL_EF_IF_1_MANUAL_EN_POS) |
@@ -349,7 +349,7 @@ static void ATTR_TCM_SECTION bflb_ef_ctrl_load_efuse_r0(struct bflb_device_s *de
 
     putreg32(reg_val, dev->reg_base + EF_CTRL_EF_IF_CTRL_0_OFFSET);
 
-    bflb_mtimer_delay_us(10);
+    arch_delay_us(10);
 
     /* Wait for efuse control idle */
     do {
@@ -424,7 +424,7 @@ static void ATTR_TCM_SECTION bflb_ef_ctrl_load_efuse_r1(struct bflb_device_s *de
 
     putreg32(reg_val, dev->reg_base + EF_CTRL_EF_IF_CTRL_1_OFFSET);
 
-    bflb_mtimer_delay_us(10);
+    arch_delay_us(10);
 
     /* Wait for efuse control idle */
     do {
@@ -569,7 +569,7 @@ void ATTR_TCM_SECTION bflb_ef_ctrl_write_direct(struct bflb_device_s *dev, uint3
 
         if (program) {
             bflb_ef_ctrl_program_efuse_r0(dev);
-            bflb_mtimer_delay_us(100);
+            arch_delay_us(100);
         }
     }
 #ifdef EF_CTRL_EFUSE_R1_SIZE
@@ -578,13 +578,13 @@ void ATTR_TCM_SECTION bflb_ef_ctrl_write_direct(struct bflb_device_s *dev, uint3
         bflb_ef_ctrl_switch_ahb_clk_r1(dev);
 
         /* Add delay for CLK to be stable */
-        bflb_mtimer_delay_us(4);
+        arch_delay_us(4);
 
         arch_memcpy4(pefuse_start, pword, region1_count);
 
         if (program) {
             bflb_ef_ctrl_program_efuse_r1(dev);
-            bflb_mtimer_delay_us(100);
+            arch_delay_us(100);
         }
     }
 #endif