mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 21:58:04 +00:00
659f4a13dd
With Linux 6.1 many of our downstream patches and out-of-tree files can be removed or at least replaced by backported upstream commits. Signed-off-by: Daniel Golle <daniel@makrotopia.org> [fix CMDLINE_OVERRIDE for arm64] Signed-off-by: Bjørn Mork <bjorn@mork.no>
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From f1da27b7c4191f78ed81d3dabf64c769f896296c Mon Sep 17 00:00:00 2001
|
|
From: "Mingming.Su" <Mingming.Su@mediatek.com>
|
|
Date: Sat, 8 Oct 2022 18:45:53 +0200
|
|
Subject: [PATCH] hwrng: mtk - add mt7986 support
|
|
|
|
1. Add trng compatible name for MT7986
|
|
2. Fix mtk_rng_wait_ready() function
|
|
|
|
Signed-off-by: Mingming.Su <Mingming.Su@mediatek.com>
|
|
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
---
|
|
drivers/char/hw_random/mtk-rng.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/char/hw_random/mtk-rng.c
|
|
+++ b/drivers/char/hw_random/mtk-rng.c
|
|
@@ -22,7 +22,7 @@
|
|
#define RNG_AUTOSUSPEND_TIMEOUT 100
|
|
|
|
#define USEC_POLL 2
|
|
-#define TIMEOUT_POLL 20
|
|
+#define TIMEOUT_POLL 60
|
|
|
|
#define RNG_CTRL 0x00
|
|
#define RNG_EN BIT(0)
|
|
@@ -77,7 +77,7 @@ static bool mtk_rng_wait_ready(struct hw
|
|
readl_poll_timeout_atomic(priv->base + RNG_CTRL, ready,
|
|
ready & RNG_READY, USEC_POLL,
|
|
TIMEOUT_POLL);
|
|
- return !!ready;
|
|
+ return !!(ready & RNG_READY);
|
|
}
|
|
|
|
static int mtk_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)
|
|
@@ -179,6 +179,7 @@ static const struct dev_pm_ops mtk_rng_p
|
|
#endif /* CONFIG_PM */
|
|
|
|
static const struct of_device_id mtk_rng_match[] = {
|
|
+ { .compatible = "mediatek,mt7986-rng" },
|
|
{ .compatible = "mediatek,mt7623-rng" },
|
|
{},
|
|
};
|