diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/Makefile
index c87074a06..aa4fc2f7d 100644
--- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/Makefile
+++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/Makefile
@@ -1,4 +1,4 @@
-SRC_FILES := clock.c 
+SRC_DIR := $(BOARD)
 
 
 include $(KERNEL_ROOT)/compiler.mk
\ No newline at end of file
diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/clock.c b/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/clock.c
deleted file mode 100644
index 39d2995d6..000000000
--- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/clock.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2020 AIIT XUOS Lab
- * XiUOS is licensed under Mulan PSL v2.
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
- * You may obtain a copy of Mulan PSL v2 at:
- *        http://license.coscl.org.cn/MulanPSL2
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details.
- */
-#include "actracer.h"
-#include "core.h"
-#include "generic_timer.h"
-
-#include "clock_common_op.h"
-
-// armv8 generic timer driver
-#define CNTV_CTL_ENABLE (1 << 0)
-#define CNTV_CTL_IMASK (1 << 1)
-#define CNTV_CTL_ISTATUS (1 << 2)
-
-static void enable_timer()
-{
-    uint32_t c = r_cntp_ctl_el0();
-    c |= CNTV_CTL_ENABLE;
-    c &= ~CNTV_CTL_IMASK;
-    w_cntp_ctl_el0(c);
-}
-
-static void disable_timer()
-{
-    uint32_t c = r_cntp_ctl_el0();
-    c |= CNTV_CTL_IMASK;
-    c &= ~CNTV_CTL_ENABLE;
-    w_cntp_ctl_el0(c);
-}
-
-static void reload_timer()
-{
-    // interval 1ms
-    static uint32_t ms = 1;
-    uint32_t interval = ms * 1000;
-    uint32_t interval_clk = interval * (r_cntfrq_el0() / 1000000);
-    w_cntp_tval_el0(interval_clk);
-}
-
-void _sys_clock_init()
-{
-    disable_timer();
-    reload_timer();
-    enable_timer();
-}
-
-static uint32_t _get_clock_int()
-{
-    return 30;
-}
-
-static uint64_t _get_tick()
-{
-    return r_cntvct_el0();
-}
-
-static uint64_t _get_second()
-{
-    return _get_tick() / r_cntfrq_el0();
-}
-
-static bool _is_timer_expired()
-{
-    return true;
-}
-
-static void _clear_clock_intr()
-{
-    disable_timer();
-    reload_timer();
-    enable_timer();
-}
-
-static struct XiziClockDriver hardkernel_clock_driver = {
-    .sys_clock_init = _sys_clock_init,
-    .get_clock_int = _get_clock_int,
-    .get_tick = _get_tick,
-    .get_second = _get_second,
-    .is_timer_expired = _is_timer_expired,
-    .clear_clock_intr = _clear_clock_intr,
-};
-
-struct XiziClockDriver* hardkernel_clock_init(struct TraceTag* hardkernel_tag)
-{
-    hardkernel_clock_driver.sys_clock_init();
-    return &hardkernel_clock_driver;
-}
\ No newline at end of file
diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/jh7110/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/jh7110/Makefile
index c87074a06..fc344cc8e 100644
--- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/jh7110/Makefile
+++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/jh7110/Makefile
@@ -1,4 +1,4 @@
-SRC_FILES := clock.c 
+SRC_FILES := clock.c timer-clint.c
 
 
 include $(KERNEL_ROOT)/compiler.mk
\ No newline at end of file
diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/jh7110/clint.h b/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/jh7110/clint.h
new file mode 100644
index 000000000..4c1dd3686
--- /dev/null
+++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/jh7110/clint.h
@@ -0,0 +1,8 @@
+#ifndef _ASM_RISCV_CLINT_H
+#define _ASM_RISCV_CLINT_H
+
+#include <asm/mmio.h>
+
+int clint_timer_init(void);
+
+#endif
diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/jh7110/clock.c b/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/jh7110/clock.c
index 39d2995d6..40929ffa2 100644
--- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/jh7110/clock.c
+++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/jh7110/clock.c
@@ -14,6 +14,8 @@
 #include "generic_timer.h"
 
 #include "clock_common_op.h"
+#include "clint.h"
+
 
 // armv8 generic timer driver
 #define CNTV_CTL_ENABLE (1 << 0)
@@ -45,8 +47,10 @@ static void reload_timer()
     w_cntp_tval_el0(interval_clk);
 }
 
+
 void _sys_clock_init()
 {
+    clint_timer_init();
     disable_timer();
     reload_timer();
     enable_timer();
diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/jh7110/timer-clint.c b/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/jh7110/timer-clint.c
new file mode 100644
index 000000000..13fde4a86
--- /dev/null
+++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/riscv/rv64gc/jh7110/timer-clint.c
@@ -0,0 +1,9 @@
+#include "clint.h"
+
+
+// Refer to linux/drivers/clocksource/timer-clint.c
+// TODO:
+int clint_timer_init(void)
+{
+	return 0;
+}
diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/riscv/rv64gc/jh7110/plic.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/riscv/rv64gc/jh7110/plic.c
index f30c22c6e..b003384db 100644
--- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/riscv/rv64gc/jh7110/plic.c
+++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/riscv/rv64gc/jh7110/plic.c
@@ -41,6 +41,7 @@ void plic_enable_irq(int cpu, int hwirq, int enable)
 }
 
 //TODO: to debug
+//Refer to linux/drivers/irqchip/irq-sifive-plic.c
 int plic_init(void)
 {
     int i;