ram: stm32mp1: Add support for multiple configs

[oweals/u-boot.git] / drivers / ram / stm32mp1 / stm32mp1_ram.c

diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c
index 7b1adc5b2433f26a21ce6e0f529464a0d2ca10cd..8bcd8612618a8b3f7fdc58260ffa4399db66497c 100644 (file)
--- a/drivers/ram/stm32mp1/stm32mp1_ram.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
@@ -57,6 +57,27 @@ 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;
+       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 +85,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);
 
 #define PARAM(x, y, z)                                                 \
        {       .name = x,                                              \
@@ -91,9 +113,9 @@ static __maybe_unused int stm32mp1_ddr_setup(struct udevice *dev)
                PHY_PARAM_OPT(cal)
        };
 
-       config.info.speed = dev_read_u32_default(dev, "st,mem-speed", 0);
-       config.info.size = dev_read_u32_default(dev, "st,mem-size", 0);
-       config.info.name = dev_read_string(dev, "st,mem-name");
+       config.info.speed = ofnode_read_u32_default(node, "st,mem-speed", 0);
+       config.info.size = ofnode_read_u32_default(node, "st,mem-size", 0);
+       config.info.name = ofnode_read_string(node, "st,mem-name");
        if (!config.info.name) {
                debug("%s: no st,mem-name\n", __func__);
                return -EINVAL;
@@ -101,7 +123,7 @@ static __maybe_unused int stm32mp1_ddr_setup(struct udevice *dev)
        printf("RAM: %s\n", config.info.name);
 
        for (idx = 0; idx < ARRAY_SIZE(param); idx++) {
-               ret = dev_read_u32_array(dev, param[idx].name,
+               ret = ofnode_read_u32_array(node, param[idx].name,
                                         (void *)((u32)&config +
                                                  param[idx].offset),
                                         param[idx].size);
@@ -182,7 +204,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
 }