Re: [PATCH v2 2/4] hwrng: stm32 - implement support for STM32MP25x platforms

Marek Vasut
2024-10-11T16:18:45Z

On 10/11/24 5:41 PM, Gatien Chevallier wrote:

[...]

> @@ -551,6 +565,41 @@ static int stm32_rng_probe(struct platform_device *ofdev)
> priv->rng.read = stm32_rng_read;
> priv->rng.quality = 900;
>
> + if (!priv->data->nb_clock || priv->data->nb_clock > 2)
> + return -EINVAL;
> +
> + priv->clk_bulk = devm_kzalloc(dev, priv->data->nb_clock * sizeof(*priv->clk_bulk),
> + GFP_KERNEL);
> + if (!priv->clk_bulk)
> + return -ENOMEM;

Try this:

ret = devm_clk_bulk_get(dev, priv->data->nb_clock, priv->clk_bulk);
...
// Swap the clock if they are not in the right order:
if (priv->data->nb_clock == 2 &&
strcmp(__clk_get_name(priv->clk_bulk[0].clk), "core"))
{
const char *id = priv->clk_bulk[1].id;
struct clk *clk = priv->clk_bulk[1].clk;
priv->clk_bulk[1].id = priv->clk_bulk[0].id;
priv->clk_bulk[1].clk = priv->clk_bulk[0].clk;
priv->clk_bulk[0].id = id;
priv->clk_bulk[0].clk = clk;
}

> + if (priv->data->nb_clock == 2) {
> + struct clk *clk;
> + struct clk *bus_clk;
> +
> + clk = devm_clk_get(&ofdev->dev, "core");
> + if (IS_ERR(clk))
> + return PTR_ERR(clk);
> +
> + bus_clk = devm_clk_get(&ofdev->dev, "bus");
> + if (IS_ERR(clk))
> + return PTR_ERR(bus_clk);
> +
> + priv->clk_bulk[0].clk = clk;
> + priv->clk_bulk[0].id = "core";
> + priv->clk_bulk[1].clk = bus_clk;
> + priv->clk_bulk[1].id = "bus";
> + } else {
> + struct clk *clk;
> +
> + clk = devm_clk_get(&ofdev->dev, NULL);
> + if (IS_ERR(clk))
> + return PTR_ERR(clk);
> +
> + priv->clk_bulk[0].clk = clk;
> + priv->clk_bulk[0].id = "core";
> + }