diff --git a/src/dev/arm/rv_ctrl.hh b/src/dev/arm/rv_ctrl.hh
--- a/src/dev/arm/rv_ctrl.hh
+++ b/src/dev/arm/rv_ctrl.hh
@@ -76,7 +76,7 @@
         Clcd       = 0x50,
         ClcdSer    = 0x54,
         Bootcs     = 0x58,
-        Clock24    = 0x5C,
+        Clock24M   = 0x5C,
         Misc       = 0x60,
         IoSel      = 0x70,
         ProcId0    = 0x84,
diff --git a/src/dev/arm/rv_ctrl.cc b/src/dev/arm/rv_ctrl.cc
--- a/src/dev/arm/rv_ctrl.cc
+++ b/src/dev/arm/rv_ctrl.cc
@@ -63,14 +63,14 @@
       case ProcId1:
         pkt->set(params()->proc_id1);
         break;
-      case Clock24:
+      case Clock24M:
         Tick clk;
-        clk = (Tick)(curTick() / (24 * SimClock::Int::us));
+        clk = (Tick)(curTick() * 24 / SimClock::Int::us);
         pkt->set((uint32_t)(clk));
         break;
       case Clock100:
         Tick clk100;
-        clk100 = (Tick)(curTick() / (100 * SimClock::Int::us));
+        clk100 = (Tick)(curTick() * 100 / SimClock::Frequency);
         pkt->set((uint32_t)(clk100));
         break;
       case Flash: