Merge tag 'u-boot-amlogic-20181207' of git://git.denx.de/u-boot-amlogic

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

diff --git a/drivers/core/read.c b/drivers/core/read.c
index 601d132..cdd78be 100644 (file)
--- a/drivers/core/read.c
+++ b/drivers/core/read.c
@@ -1,10 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2017 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
+#include <asm/types.h>
+#include <asm/io.h>
 #include <common.h>
 #include <dm.h>
 #include <mapmem.h>
@@ -58,6 +59,36 @@ fdt_addr_t dev_read_addr_index(struct udevice *dev, int index)
                return devfdt_get_addr_index(dev, index);
 }
 
+void *dev_remap_addr_index(struct udevice *dev, int index)
+{
+       fdt_addr_t addr = dev_read_addr_index(dev, index);
+
+       if (addr == FDT_ADDR_T_NONE)
+               return NULL;
+
+       return map_physmem(addr, 0, MAP_NOCACHE);
+}
+
+fdt_addr_t dev_read_addr_name(struct udevice *dev, const char *name)
+{
+       int index = dev_read_stringlist_search(dev, "reg-names", name);
+
+       if (index < 0)
+               return FDT_ADDR_T_NONE;
+       else
+               return dev_read_addr_index(dev, index);
+}
+
+void *dev_remap_addr_name(struct udevice *dev, const char *name)
+{
+       fdt_addr_t addr = dev_read_addr_name(dev, name);
+
+       if (addr == FDT_ADDR_T_NONE)
+               return NULL;
+
+       return map_physmem(addr, 0, MAP_NOCACHE);
+}
+
 fdt_addr_t dev_read_addr(struct udevice *dev)
 {
        return dev_read_addr_index(dev, 0);
@@ -70,6 +101,11 @@ void *dev_read_addr_ptr(struct udevice *dev)
        return (addr == FDT_ADDR_T_NONE) ? NULL : map_sysmem(addr, 0);
 }
 
+void *dev_remap_addr(struct udevice *dev)
+{
+       return dev_remap_addr_index(dev, 0);
+}
+
 fdt_addr_t dev_read_addr_size(struct udevice *dev, const char *property,
                              fdt_size_t *sizep)
 {