fix iproc_rng200 driver for upstream changes
This commit is contained in:
parent
65ed4db407
commit
a05d9090bf
@ -152,11 +152,11 @@ index 0000000000..1063f43953
|
||||
+#define RNG_FIFO_COUNT_OFFSET 0x24
|
||||
+#define RNG_FIFO_COUNT_RNG_FIFO_COUNT_MASK 0x000000FF
|
||||
+
|
||||
+struct iproc_rng200_platdata {
|
||||
+struct iproc_rng200_plat {
|
||||
+ fdt_addr_t base;
|
||||
+};
|
||||
+
|
||||
+static void iproc_rng200_enable(struct iproc_rng200_platdata *pdata, bool enable)
|
||||
+static void iproc_rng200_enable(struct iproc_rng200_plat *pdata, bool enable)
|
||||
+{
|
||||
+ fdt_addr_t rng_base = pdata->base;
|
||||
+ u32 val;
|
||||
@ -172,7 +172,7 @@ index 0000000000..1063f43953
|
||||
+
|
||||
+}
|
||||
+
|
||||
+static void iproc_rng200_restart(struct iproc_rng200_platdata *pdata)
|
||||
+static void iproc_rng200_restart(struct iproc_rng200_plat *pdata)
|
||||
+{
|
||||
+ fdt_addr_t rng_base = pdata->base;
|
||||
+ u32 val;
|
||||
@ -204,7 +204,7 @@ index 0000000000..1063f43953
|
||||
+
|
||||
+static int iproc_rng200_read(struct udevice *dev, void *data, size_t len)
|
||||
+{
|
||||
+ struct iproc_rng200_platdata *priv = dev_get_platdata(dev);
|
||||
+ struct iproc_rng200_plat *priv = dev_get_plat(dev);
|
||||
+ char *buf = (char *)data;
|
||||
+ u32 num_remaining = len;
|
||||
+ u32 status;
|
||||
@ -256,7 +256,7 @@ index 0000000000..1063f43953
|
||||
+
|
||||
+static int iproc_rng200_probe(struct udevice *dev)
|
||||
+{
|
||||
+ struct iproc_rng200_platdata *priv = dev_get_platdata(dev);
|
||||
+ struct iproc_rng200_plat *priv = dev_get_plat(dev);
|
||||
+
|
||||
+ iproc_rng200_enable(priv, true);
|
||||
+
|
||||
@ -265,16 +265,16 @@ index 0000000000..1063f43953
|
||||
+
|
||||
+static int iproc_rng200_remove(struct udevice *dev)
|
||||
+{
|
||||
+ struct iproc_rng200_platdata *priv = dev_get_platdata(dev);
|
||||
+ struct iproc_rng200_plat *priv = dev_get_plat(dev);
|
||||
+
|
||||
+ iproc_rng200_enable(priv, false);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int iproc_rng200_ofdata_to_platdata(struct udevice *dev)
|
||||
+static int iproc_rng200_of_to_plat(struct udevice *dev)
|
||||
+{
|
||||
+ struct iproc_rng200_platdata *pdata = dev_get_platdata(dev);
|
||||
+ struct iproc_rng200_plat *pdata = dev_get_plat(dev);
|
||||
+
|
||||
+ pdata->base = dev_read_addr(dev);
|
||||
+ if (!pdata->base)
|
||||
@ -300,8 +300,8 @@ index 0000000000..1063f43953
|
||||
+ .ops = &iproc_rng200_ops,
|
||||
+ .probe = iproc_rng200_probe,
|
||||
+ .remove = iproc_rng200_remove,
|
||||
+ .platdata_auto_alloc_size = sizeof(struct iproc_rng200_platdata),
|
||||
+ .ofdata_to_platdata = iproc_rng200_ofdata_to_platdata,
|
||||
+ .priv_auto = sizeof(struct iproc_rng200_plat),
|
||||
+ .of_to_plat = iproc_rng200_of_to_plat,
|
||||
+};
|
||||
|
||||
From patchwork Tue Dec 15 09:49:24 2020
|
||||
@ -440,11 +440,11 @@ diff --git a/drivers/rng/iproc_rng200.c b/drivers/rng/iproc_rng200.c
|
||||
index 1063f43953..378f6cf48d 100644
|
||||
--- a/drivers/rng/iproc_rng200.c
|
||||
+++ b/drivers/rng/iproc_rng200.c
|
||||
@@ -50,7 +50,6 @@ static void iproc_rng200_enable(struct iproc_rng200_platdata *pdata, bool enable
|
||||
@@ -50,7 +50,6 @@ static void iproc_rng200_enable(struct iproc_rng200_plat *pdata, bool enable
|
||||
val &= ~RNG_CTRL_RNG_RBGEN_ENABLE;
|
||||
|
||||
writel(val, rng_base + RNG_CTRL_OFFSET);
|
||||
-
|
||||
}
|
||||
|
||||
static void iproc_rng200_restart(struct iproc_rng200_platdata *pdata)
|
||||
static void iproc_rng200_restart(struct iproc_rng200_plat *pdata)
|
||||
|
Loading…
Reference in New Issue
Block a user