summaryrefslogtreecommitdiff
path: root/drivers/rng
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/rng')
-rw-r--r--drivers/rng/arm_rndr.c3
-rw-r--r--drivers/rng/iproc_rng200.c3
-rw-r--r--drivers/rng/meson-rng.c1
-rw-r--r--drivers/rng/msm_rng.c5
-rw-r--r--drivers/rng/npcm_rng.c1
-rw-r--r--drivers/rng/optee_rng.c2
-rw-r--r--drivers/rng/rng-uclass.c1
-rw-r--r--drivers/rng/rockchip_rng.c17
-rw-r--r--drivers/rng/sandbox_rng.c3
-rw-r--r--drivers/rng/smccc_trng.c3
-rw-r--r--drivers/rng/stm32_rng.c4
11 files changed, 19 insertions, 24 deletions
diff --git a/drivers/rng/arm_rndr.c b/drivers/rng/arm_rndr.c
index 4512330e68d..bf54aec4f1f 100644
--- a/drivers/rng/arm_rndr.c
+++ b/drivers/rng/arm_rndr.c
@@ -9,11 +9,10 @@
#define LOG_CATEGORY UCLASS_RNG
-#include <common.h>
#include <dm.h>
-#include <linux/kernel.h>
#include <rng.h>
#include <asm/system.h>
+#include <linux/kernel.h>
#define DRIVER_NAME "arm-rndr"
diff --git a/drivers/rng/iproc_rng200.c b/drivers/rng/iproc_rng200.c
index 85ac15bf9ca..4c49aa9e444 100644
--- a/drivers/rng/iproc_rng200.c
+++ b/drivers/rng/iproc_rng200.c
@@ -5,11 +5,10 @@
* Driver for Raspberry Pi hardware random number generator
*/
-#include <common.h>
#include <dm.h>
-#include <linux/delay.h>
#include <rng.h>
#include <asm/io.h>
+#include <linux/delay.h>
#define usleep_range(a, b) udelay((b))
diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c
index fd2988e91b5..49037d11656 100644
--- a/drivers/rng/meson-rng.c
+++ b/drivers/rng/meson-rng.c
@@ -5,7 +5,6 @@
* Driver for Amlogic hardware random number generator
*/
-#include <common.h>
#include <clk.h>
#include <dm.h>
#include <rng.h>
diff --git a/drivers/rng/msm_rng.c b/drivers/rng/msm_rng.c
index 29e7354ece5..658c153d3ed 100644
--- a/drivers/rng/msm_rng.c
+++ b/drivers/rng/msm_rng.c
@@ -9,12 +9,11 @@
* Based on Linux driver
*/
-#include <asm/io.h>
#include <clk.h>
-#include <common.h>
#include <dm.h>
-#include <linux/bitops.h>
#include <rng.h>
+#include <asm/io.h>
+#include <linux/bitops.h>
/* Device specific register offsets */
#define PRNG_DATA_OUT 0x0000
diff --git a/drivers/rng/npcm_rng.c b/drivers/rng/npcm_rng.c
index 70c1c032b6d..3922acad5bb 100644
--- a/drivers/rng/npcm_rng.c
+++ b/drivers/rng/npcm_rng.c
@@ -3,7 +3,6 @@
* Copyright (c) 2022 Nuvoton Technology Corp.
*/
-#include <common.h>
#include <dm.h>
#include <malloc.h>
#include <rng.h>
diff --git a/drivers/rng/optee_rng.c b/drivers/rng/optee_rng.c
index 410dfc053f1..f692681022a 100644
--- a/drivers/rng/optee_rng.c
+++ b/drivers/rng/optee_rng.c
@@ -4,8 +4,6 @@
*/
#define LOG_CATEGORY UCLASS_RNG
-#include <common.h>
-
#include <rng.h>
#include <tee.h>
#include <dm/device.h>
diff --git a/drivers/rng/rng-uclass.c b/drivers/rng/rng-uclass.c
index 53108e1b319..06ddfa14ac8 100644
--- a/drivers/rng/rng-uclass.c
+++ b/drivers/rng/rng-uclass.c
@@ -5,7 +5,6 @@
#define LOG_CATEGORY UCLASS_RNG
-#include <common.h>
#include <dm.h>
#include <rng.h>
diff --git a/drivers/rng/rockchip_rng.c b/drivers/rng/rockchip_rng.c
index 705b424cf3d..2426648fbd5 100644
--- a/drivers/rng/rockchip_rng.c
+++ b/drivers/rng/rockchip_rng.c
@@ -2,14 +2,13 @@
/*
* Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd
*/
-#include <asm/arch-rockchip/hardware.h>
-#include <asm/io.h>
-#include <common.h>
+
#include <dm.h>
+#include <rng.h>
+#include <asm/arch-rockchip/hardware.h>
#include <linux/bitops.h>
#include <linux/iopoll.h>
#include <linux/string.h>
-#include <rng.h>
#define RK_HW_RNG_MAX 32
@@ -302,7 +301,15 @@ static const struct dm_rng_ops rockchip_rng_ops = {
static const struct udevice_id rockchip_rng_match[] = {
{
- .compatible = "rockchip,cryptov1-rng",
+ .compatible = "rockchip,rk3288-crypto",
+ .data = (ulong)&rk_cryptov1_soc_data,
+ },
+ {
+ .compatible = "rockchip,rk3328-crypto",
+ .data = (ulong)&rk_cryptov1_soc_data,
+ },
+ {
+ .compatible = "rockchip,rk3399-crypto",
.data = (ulong)&rk_cryptov1_soc_data,
},
{
diff --git a/drivers/rng/sandbox_rng.c b/drivers/rng/sandbox_rng.c
index cc5e1f6e25b..071a3228e8a 100644
--- a/drivers/rng/sandbox_rng.c
+++ b/drivers/rng/sandbox_rng.c
@@ -3,11 +3,10 @@
* Copyright (c) 2019, Linaro Limited
*/
-#include <common.h>
#include <dm.h>
#include <rand.h>
#include <rng.h>
-
+#include <time.h>
#include <linux/string.h>
static int sandbox_rng_read(struct udevice *dev, void *data, size_t len)
diff --git a/drivers/rng/smccc_trng.c b/drivers/rng/smccc_trng.c
index 3a4bb339415..f59b80666b3 100644
--- a/drivers/rng/smccc_trng.c
+++ b/drivers/rng/smccc_trng.c
@@ -5,7 +5,6 @@
#define LOG_CATEGORY UCLASS_RNG
-#include <common.h>
#include <dm.h>
#include <linker_lists.h>
#include <log.h>
@@ -166,7 +165,7 @@ static int smccc_trng_probe(struct udevice *dev)
struct smccc_trng_priv *priv = dev_get_priv(dev);
struct arm_smccc_res res;
- if (!(smccc_trng_is_supported(smccc->invoke_fn)))
+ if (!smccc || !(smccc_trng_is_supported(smccc->invoke_fn)))
return -ENODEV;
/* At least one of 64bit and 32bit interfaces is available */
diff --git a/drivers/rng/stm32_rng.c b/drivers/rng/stm32_rng.c
index c397b4d95cd..61d5ed61582 100644
--- a/drivers/rng/stm32_rng.c
+++ b/drivers/rng/stm32_rng.c
@@ -5,16 +5,14 @@
#define LOG_CATEGORY UCLASS_RNG
-#include <common.h>
#include <clk.h>
#include <dm.h>
#include <log.h>
#include <reset.h>
#include <rng.h>
+#include <asm/io.h>
#include <linux/bitops.h>
#include <linux/delay.h>
-
-#include <asm/io.h>
#include <linux/iopoll.h>
#include <linux/kernel.h>