On 2025/4/9 06:11, Jonas Karlman wrote:
Linux commit 6ee0b9ad3995 ("arm64: dts: rockchip: Add rng node to
RK3588") merged for v6.15-rc1 add a proper rng node to the device tree.
The compatible used differs compared to what U-Boot is currently using.

Replace the old trngv1 compatible with the dts/upstream compatible in
the rng driver and remove the old rng node compatible override from SoC
u-boot.dtsi to keep rng working after the driver change.

Signed-off-by: Jonas Karlman <jo...@kwiboo.se>
Reviewed-by: Kever Yang <kever.y...@rock-chips.com>

Thanks,
- Kever
---
v2: Remove the rng node instead of changing compatible
---
  arch/arm/dts/rk3588s-u-boot.dtsi | 5 -----
  drivers/rng/rockchip_rng.c       | 2 +-
  2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi
index 8880d162b11c..5eeb138f3513 100644
--- a/arch/arm/dts/rk3588s-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-u-boot.dtsi
@@ -18,11 +18,6 @@
                compatible = "rockchip,rk3588-dmc";
                bootph-all;
        };
-
-       rng: rng@fe378000 {
-               compatible = "rockchip,trngv1";
-               reg = <0x0 0xfe378000 0x0 0x200>;
-       };
  };
#ifdef CONFIG_ROCKCHIP_SPI_IMAGE
diff --git a/drivers/rng/rockchip_rng.c b/drivers/rng/rockchip_rng.c
index f673e2657c94..6e4e3abf08c8 100644
--- a/drivers/rng/rockchip_rng.c
+++ b/drivers/rng/rockchip_rng.c
@@ -321,7 +321,7 @@ static const struct udevice_id rockchip_rng_match[] = {
                .data = (ulong)&rk_cryptov2_soc_data,
        },
        {
-               .compatible = "rockchip,trngv1",
+               .compatible = "rockchip,rk3588-rng",
                .data = (ulong)&rk_trngv1_soc_data,
        },
        {},

Reply via email to