2 files changed, 6 insertions, 0 deletions

diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index 7135f50082d6..2964f5f4a7ef 100644
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -184,6 +184,9 @@ static void sh_cmt_disable(struct sh_cmt_priv *p)
         /* disable channel */
         sh_cmt_start_stop_ch(p, 0);
 
+        /* disable interrupts in CMT block */
+        sh_cmt_write(p, CMCSR, 0);
+
         /* stop clock */
         clk_disable(p->clk);
 }
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index 08e6ec2cb094..9ffb05f4095d 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -138,6 +138,9 @@ static void sh_tmu_disable(struct sh_tmu_priv *p)
         /* disable channel */
         sh_tmu_start_stop_ch(p, 0);
 
+        /* disable interrupts in TMU block */
+        sh_tmu_write(p, TCR, 0x0000);
+
         /* stop clock */
         clk_disable(p->clk);
 }