rockchip: disable hwrng for rk3588 by default

It's not working with current clk driver.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2024-07-11 20:47:14 +08:00
parent ad9fbe2f0a
commit 86b4b39f83
4 changed files with 5 additions and 29 deletions

View File

@@ -86,7 +86,7 @@ Link: https://lore.kernel.org/r/20231023032251.164775-1-luben.tuikov@amd.com
dev_name(gpu->dev), gpu->dev);
--- a/drivers/gpu/drm/lima/lima_sched.c
+++ b/drivers/gpu/drm/lima/lima_sched.c
@@ -488,7 +488,9 @@ int lima_sched_pipe_init(struct lima_sch
@@ -495,7 +495,9 @@ int lima_sched_pipe_init(struct lima_sch
INIT_WORK(&pipe->recover_work, lima_sched_recover_work);

View File

@@ -86,7 +86,7 @@ Signed-off-by: Luben Tuikov <ltuikov89@gmail.com>
msecs_to_jiffies(500), NULL, NULL,
--- a/drivers/gpu/drm/lima/lima_sched.c
+++ b/drivers/gpu/drm/lima/lima_sched.c
@@ -488,7 +488,7 @@ int lima_sched_pipe_init(struct lima_sch
@@ -495,7 +495,7 @@ int lima_sched_pipe_init(struct lima_sch
INIT_WORK(&pipe->recover_work, lima_sched_recover_work);

View File

@@ -11,7 +11,7 @@ Change-Id: Ifb8964053daa6b593dd2c2c6a3b8caab8526e56d
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
@@ -1769,6 +1769,16 @@
@@ -1769,6 +1769,17 @@
status = "disabled";
};
@@ -19,10 +19,11 @@ Change-Id: Ifb8964053daa6b593dd2c2c6a3b8caab8526e56d
+ compatible = "rockchip,trngv1";
+ reg = <0x0 0xfe378000 0x0 0x200>;
+ interrupts = <GIC_SPI 400 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cru SCMI_HCLK_SECURE_NS>;
+ clocks = <&scmi_clk SCMI_HCLK_SECURE_NS>;
+ clock-names = "hclk_trng";
+ resets = <&scmi_reset SRST_H_TRNG_NS>;
+ reset-names = "reset";
+ status = "disabled";
+ };
+
i2s0_8ch: i2s@fe470000 {

View File

@@ -1,25 +0,0 @@
From 8f3ec330491d807e613c40fe83f85a28ad8d5f6c Mon Sep 17 00:00:00 2001
From: Lin Jinhan <troy.lin@rock-chips.com>
Date: Wed, 17 Nov 2021 14:51:34 +0800
Subject: [PATCH] arm64: dts: rockchip: rk3588s: rng: use scmi_clk
rng module should use scmi_clk rather than cru.
Fixes: b56b10f0075e ("arm64: dts: rockchip: rk3588s: add rng node")
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I49994529fcc209c2bc173c1abc497536fb920302
---
arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
@@ -1773,7 +1773,7 @@
compatible = "rockchip,trngv1";
reg = <0x0 0xfe378000 0x0 0x200>;
interrupts = <GIC_SPI 400 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&cru SCMI_HCLK_SECURE_NS>;
+ clocks = <&scmi_clk SCMI_HCLK_SECURE_NS>;
clock-names = "hclk_trng";
resets = <&scmi_reset SRST_H_TRNG_NS>;
reset-names = "reset";