Dear Marek,
> From: Marek Vasut <[email protected]>
> Sent: vendredi 10 avril 2020 20:56
>
> Add support for multiple DRAM configuration subnodes, while retaining the
> support for a single flat DRAM configuration node. This is useful on systems
> which can be manufactured in multiple configurations and where the DRAM
> configuration can be determined at runtime.
>
> The code is augmented by a function which can be overridden on board level,
> allowing a match on the configuration node name, very much like the fitImage
> configuration node name matching works. The default match is on the single
> top-
> level DRAM configuration, if matching on subnodes is required, then this
> board_stm32mp1_ddr_config_name_match() must be overridden.
>
> Signed-off-by: Marek Vasut <[email protected]>
> Cc: Manivannan Sadhasivam <[email protected]>
> Cc: Patrick Delaunay <[email protected]>
> Cc: Patrice Chotard <[email protected]>
> ---
> V2: Match on compatible string
> ---
> drivers/ram/stm32mp1/stm32mp1_ram.c | 39 +++++++++++++++++++++++++----
> 1 file changed, 34 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c
> b/drivers/ram/stm32mp1/stm32mp1_ram.c
> index eb78f1198d..21c220694e 100644
> --- a/drivers/ram/stm32mp1/stm32mp1_ram.c
> +++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
> @@ -57,6 +57,33 @@ int stm32mp1_ddr_clk_enable(struct ddr_info *priv, uint32_t
> mem_speed)
> return 0;
> }
>
> +__weak int board_stm32mp1_ddr_config_name_match(struct udevice *dev,
> + const char *name)
> +{
> + return 0; /* Always match */
> +}
> +
> +static ofnode stm32mp1_ddr_get_ofnode(struct udevice *dev) {
> + const char *name;
> + int name_size;
> + ofnode node;
> +
> + node = dev_ofnode(dev);
> + name = ofnode_get_property(node, "compatible", &name_size);
> + if (!board_stm32mp1_ddr_config_name_match(dev, name))
> + return node;
> +
> + dev_for_each_subnode(node, dev) {
> + name = ofnode_get_property(node, "compatible", &name_size);
> +
> + if (!board_stm32mp1_ddr_config_name_match(dev, name))
> + return node;
> + }
> +
> + return ofnode_null();
> +}
> +
I think the ddr node could be the fallback when any subnode exist:
board_stm32mp1_ddr_config_name_match() is only usefull/called
when several configuration exist.
And name_size can be replaced by NULL,
So function can be simplify to:
static ofnode stm32mp1_ddr_get_ofnode(struct udevice *dev) {
const char *name;
ofnode node;
dev_for_each_subnode(node, dev) {
name = ofnode_get_property(node, "compatible", NULL);
if (!board_stm32mp1_ddr_config_name_match(dev, name))
return node;
}
return dev_ofnode(dev);
}
> static __maybe_unused int stm32mp1_ddr_setup(struct udevice *dev) {
> struct ddr_info *priv = dev_get_priv(dev); @@ -64,6 +91,7 @@ static
> __maybe_unused int stm32mp1_ddr_setup(struct udevice *dev)
> unsigned int idx;
> struct clk axidcg;
> struct stm32mp1_ddr_config config;
> + ofnode node = stm32mp1_ddr_get_ofnode(dev);
[...]
> @@ -164,7 +192,8 @@ static int stm32mp1_ddr_probe(struct udevice *dev)
> priv->info.size = 0;
> return stm32mp1_ddr_setup(dev);
> #else
> - priv->info.size = dev_read_u32_default(dev, "st,mem-size", 0);
> + ofnode node = stm32mp1_ddr_get_ofnode(dev);
> + priv->info.size = ofnode_read_u32_default(node, "st,mem-size", 0);
> return 0;
> #endif
> }
> --
> 2.25.1
For the rest
Reviewed-by: Patrick Delaunay <[email protected]>
Thanks
Patrick
