2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 3cade79ea41e..8908d040b1f2 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -355,8 +355,8 @@ static void kick_trng(struct platform_device *pdev, int ent_delay)
         wr_reg32(&r4tst->rtsdctl, val);
         /* min. freq. count, equal to 1/4 of the entropy sample length */
         wr_reg32(&r4tst->rtfrqmin, ent_delay >> 2);
-        /* max. freq. count, equal to 8 times the entropy sample length */
-        wr_reg32(&r4tst->rtfrqmax, ent_delay << 3);
+        /* disable maximum frequency count */
+        wr_reg32(&r4tst->rtfrqmax, RTFRQMAX_DISABLE);
         /* put RNG4 into run mode */
         clrbits32(&r4tst->rtmctl, RTMCTL_PRGM);
 }
diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h
index f48e344ffc39..b8bd980ac00a 100644
--- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h
@@ -286,6 +286,7 @@ struct rng4tst {
                 u32 rttotsam;   /* PRGM=0: total samples register */
         };
         u32 rtfrqmin;           /* frequency count min. limit register */
+#define RTFRQMAX_DISABLE        (1 << 20)
         union {
                 u32 rtfrqmax;   /* PRGM=1: freq. count max. limit register */
                 u32 rtfrqcnt;   /* PRGM=0: freq. count register */