Merge branch '2021-07-28-setexpr-fmt-support'

[platform/kernel/u-boot.git] / drivers / core / read.c

diff --git a/drivers/core/read.c b/drivers/core/read.c
index 0761258..4307ca4 100644 (file)
--- a/drivers/core/read.c
+++ b/drivers/core/read.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <dm/of_access.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 #include <asm/types.h>
 #include <asm/io.h>
 #include <linux/ioport.h>
@@ -281,8 +282,10 @@ int dev_read_alias_seq(const struct udevice *dev, int *devnump)
 
        if (ofnode_is_np(node)) {
                ret = of_alias_get_id(ofnode_to_np(node), uc_name);
-               if (ret >= 0)
+               if (ret >= 0) {
                        *devnump = ret;
+                       ret = 0;
+               }
        } else {
 #if CONFIG_IS_ENABLED(OF_CONTROL)
                ret = fdtdec_get_alias_seq(gd->fdt_blob, uc_name,
@@ -338,6 +341,12 @@ u64 dev_translate_dma_address(const struct udevice *dev, const fdt32_t *in_addr)
        return ofnode_translate_dma_address(dev_ofnode(dev), in_addr);
 }
 
+int dev_get_dma_range(const struct udevice *dev, phys_addr_t *cpu,
+                     dma_addr_t *bus, u64 *size)
+{
+       return ofnode_get_dma_range(dev_ofnode(dev), cpu, bus, size);
+}
+
 int dev_read_alias_highest_id(const char *stem)
 {
        if (of_live_active())
@@ -377,3 +386,9 @@ int dev_read_pci_bus_range(const struct udevice *dev,
 
        return 0;
 }
+
+int dev_decode_display_timing(const struct udevice *dev, int index,
+                             struct display_timing *config)
+{
+       return ofnode_decode_display_timing(dev_ofnode(dev), index, config);
+}