From f5721cfeb2f5f7b77290ec563a02b32210983555 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 27 Feb 2024 20:36:35 +0800 Subject: [PATCH] rockchip: enable hwRNG support at SoC level RK3328 is skipped due to hardware bugs. Signed-off-by: Tianling Shen (cherry picked from commit ffd4b3c3aed04aa587db21787f798f8caa2611af) --- .../boot/dts/rockchip/rk3568-mrkaio-m68s.dtsi | 4 -- ...dts-rockchip-add-rng-node-for-rk3399.patch | 3 +- ...64-dts-rockchip-rk356x-add-rng-node.patch} | 13 +++-- ...hip-enable-hwrng-for-rockchip-boards.patch | 52 ------------------- 4 files changed, 7 insertions(+), 65 deletions(-) rename target/linux/rockchip/patches-5.15/{801-04-arm64-dts-rockchip-rk3568-add-rng-node.patch => 801-04-arm64-dts-rockchip-rk356x-add-rng-node.patch} (77%) delete mode 100644 target/linux/rockchip/patches-5.15/801-05-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-mrkaio-m68s.dtsi b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-mrkaio-m68s.dtsi index f9c7cc9765..9fce09abfe 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-mrkaio-m68s.dtsi +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-mrkaio-m68s.dtsi @@ -403,10 +403,6 @@ status = "okay"; }; -&rng { - status = "okay"; -}; - &saradc { vref-supply = <&vcca_1v8>; status = "okay"; diff --git a/target/linux/rockchip/patches-5.15/801-03-arm64-dts-rockchip-add-rng-node-for-rk3399.patch b/target/linux/rockchip/patches-5.15/801-03-arm64-dts-rockchip-add-rng-node-for-rk3399.patch index 2a61f72ca4..cc7743dea0 100644 --- a/target/linux/rockchip/patches-5.15/801-03-arm64-dts-rockchip-add-rng-node-for-rk3399.patch +++ b/target/linux/rockchip/patches-5.15/801-03-arm64-dts-rockchip-add-rng-node-for-rk3399.patch @@ -13,7 +13,7 @@ Signed-off-by: Lin Jinhan --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -@@ -1939,6 +1939,16 @@ +@@ -1939,6 +1939,15 @@ }; }; @@ -24,7 +24,6 @@ Signed-off-by: Lin Jinhan + clock-names = "clk_crypto", "hclk_crypto"; + assigned-clocks = <&cru SCLK_CRYPTO1>, <&cru HCLK_S_CRYPTO1>; + assigned-clock-rates = <150000000>, <100000000>; -+ status = "disabled"; + }; + gpu: gpu@ff9a0000 { diff --git a/target/linux/rockchip/patches-5.15/801-04-arm64-dts-rockchip-rk3568-add-rng-node.patch b/target/linux/rockchip/patches-5.15/801-04-arm64-dts-rockchip-rk356x-add-rng-node.patch similarity index 77% rename from target/linux/rockchip/patches-5.15/801-04-arm64-dts-rockchip-rk3568-add-rng-node.patch rename to target/linux/rockchip/patches-5.15/801-04-arm64-dts-rockchip-rk356x-add-rng-node.patch index c3f36ff2a9..65dcf66779 100644 --- a/target/linux/rockchip/patches-5.15/801-04-arm64-dts-rockchip-rk3568-add-rng-node.patch +++ b/target/linux/rockchip/patches-5.15/801-04-arm64-dts-rockchip-rk356x-add-rng-node.patch @@ -9,10 +9,10 @@ Signed-off-by: Lin Jinhan arch/arm64/boot/dts/rockchip/rk3568.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) ---- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi -@@ -213,6 +213,16 @@ - }; +--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi +@@ -1570,6 +1570,15 @@ + status = "disabled"; }; + rng: rng@fe388000 { @@ -22,9 +22,8 @@ Signed-off-by: Lin Jinhan + clock-names = "clk_trng", "hclk_trng"; + resets = <&cru SRST_TRNG_NS>; + reset-names = "reset"; -+ status = "disabled"; + }; + - combphy0: phy@fe820000 { + combphy1: phy@fe830000 { compatible = "rockchip,rk3568-naneng-combphy"; - reg = <0x0 0xfe820000 0x0 0x100>; + reg = <0x0 0xfe830000 0x0 0x100>; diff --git a/target/linux/rockchip/patches-5.15/801-05-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch b/target/linux/rockchip/patches-5.15/801-05-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch deleted file mode 100644 index 1621afd2bd..0000000000 --- a/target/linux/rockchip/patches-5.15/801-05-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi -@@ -608,6 +608,10 @@ - status = "okay"; - }; - -+&rng { -+ status = "okay"; -+}; -+ - &saradc { - vref-supply = <&vcca1v8_s3>; - status = "okay"; ---- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi -@@ -423,6 +423,10 @@ - status = "okay"; - }; - -+&rng { -+ status = "okay"; -+}; -+ - &saradc { - vref-supply = <&vcca_1v8>; - status = "okay"; ---- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi -@@ -486,6 +486,10 @@ - status = "okay"; - }; - -+&rng { -+ status = "okay"; -+}; -+ - &saradc { - vref-supply = <&vcca_1v8>; - status = "okay"; ---- a/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts -@@ -546,6 +546,10 @@ - status = "okay"; - }; - -+&rng { -+ status = "okay"; -+}; -+ - &saradc { - vref-supply = <&vcca_1v8>; - status = "okay";