From ffd4b3c3aed04aa587db21787f798f8caa2611af 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 --- ...dts-rockchip-add-rng-node-for-rk3399.patch | 3 +- ...m64-dts-rockchip-rk356x-add-rng-node.patch | 3 +- ...64-dts-rockchip-rk3588s-add-rng-node.patch | 3 +- ...hip-enable-hwrng-for-rockchip-boards.patch | 143 ------------------ 4 files changed, 3 insertions(+), 149 deletions(-) delete mode 100644 target/linux/rockchip/patches-6.1/801-07-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch diff --git a/target/linux/rockchip/patches-6.1/801-03-arm64-dts-rockchip-add-rng-node-for-rk3399.patch b/target/linux/rockchip/patches-6.1/801-03-arm64-dts-rockchip-add-rng-node-for-rk3399.patch index bce09b8cb7..78cc910950 100644 --- a/target/linux/rockchip/patches-6.1/801-03-arm64-dts-rockchip-add-rng-node-for-rk3399.patch +++ b/target/linux/rockchip/patches-6.1/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 -@@ -2045,6 +2045,16 @@ +@@ -2045,6 +2045,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-6.1/801-04-arm64-dts-rockchip-rk356x-add-rng-node.patch b/target/linux/rockchip/patches-6.1/801-04-arm64-dts-rockchip-rk356x-add-rng-node.patch index b21769039f..5e312ff0c8 100644 --- a/target/linux/rockchip/patches-6.1/801-04-arm64-dts-rockchip-rk356x-add-rng-node.patch +++ b/target/linux/rockchip/patches-6.1/801-04-arm64-dts-rockchip-rk356x-add-rng-node.patch @@ -11,7 +11,7 @@ Signed-off-by: Lin Jinhan --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi -@@ -1022,6 +1022,16 @@ +@@ -1022,6 +1022,15 @@ }; }; @@ -22,7 +22,6 @@ Signed-off-by: Lin Jinhan + clock-names = "clk_trng", "hclk_trng"; + resets = <&cru SRST_TRNG_NS>; + reset-names = "reset"; -+ status = "disabled"; + }; + sdmmc0: mmc@fe2b0000 { diff --git a/target/linux/rockchip/patches-6.1/801-05-arm64-dts-rockchip-rk3588s-add-rng-node.patch b/target/linux/rockchip/patches-6.1/801-05-arm64-dts-rockchip-rk3588s-add-rng-node.patch index 03208a0de1..f05a429023 100644 --- a/target/linux/rockchip/patches-6.1/801-05-arm64-dts-rockchip-rk3588s-add-rng-node.patch +++ b/target/linux/rockchip/patches-6.1/801-05-arm64-dts-rockchip-rk3588s-add-rng-node.patch @@ -11,7 +11,7 @@ Change-Id: Ifb8964053daa6b593dd2c2c6a3b8caab8526e56d --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi -@@ -2145,6 +2145,17 @@ +@@ -2145,6 +2145,16 @@ status = "disabled"; }; @@ -23,7 +23,6 @@ Change-Id: Ifb8964053daa6b593dd2c2c6a3b8caab8526e56d + clock-names = "hclk_trng"; + resets = <&scmi_reset SRST_H_TRNG_NS>; + reset-names = "reset"; -+ status = "disabled"; + }; + i2s0_8ch: i2s@fe470000 { diff --git a/target/linux/rockchip/patches-6.1/801-07-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch b/target/linux/rockchip/patches-6.1/801-07-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch deleted file mode 100644 index 3123a78302..0000000000 --- a/target/linux/rockchip/patches-6.1/801-07-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch +++ /dev/null @@ -1,143 +0,0 @@ ---- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi -@@ -609,6 +609,10 @@ - status = "okay"; - }; - -+&rng { -+ status = "okay"; -+}; -+ - &saradc { - vref-supply = <&vcca1v8_s3>; - status = "okay"; ---- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi -@@ -346,6 +346,10 @@ - status = "okay"; - }; - -+&rng { -+ status = "okay"; -+}; -+ - &saradc { - vref-supply = <&vcca_1v8>; - status = "okay"; ---- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi -@@ -424,6 +424,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"; ---- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts -@@ -714,6 +714,10 @@ - status = "okay"; - }; - -+&rng { -+ status = "okay"; -+}; -+ - &saradc { - vref-supply = <&vcca_1v8>; - status = "okay"; ---- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts -@@ -650,6 +650,10 @@ - status = "okay"; - }; - -+&rng { -+ status = "okay"; -+}; -+ - &saradc { - vref-supply = <&avcc_1v8_s0>; - status = "okay"; ---- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -@@ -431,6 +431,10 @@ - status = "okay"; - }; - -+&rng { -+ status = "okay"; -+}; -+ - &saradc { - vref-supply = <&vcc_1v8_s0>; - status = "okay"; ---- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -439,6 +439,10 @@ - status = "okay"; - }; - -+&rng { -+ status = "okay"; -+}; -+ - &saradc { - vref-supply = <&avcc_1v8_s0>; - status = "okay"; ---- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts -@@ -269,6 +269,10 @@ - }; - }; - -+&rng { -+ status = "okay"; -+}; -+ - &saradc { - vref-supply = <&avcc_1v8_s0>; - status = "okay"; ---- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts -@@ -359,6 +359,10 @@ - status = "okay"; - }; - -+&rng { -+ status = "okay"; -+}; -+ - &saradc { - vref-supply = <&avcc_1v8_s0>; - status = "okay";