libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>

[u-boot] / drivers / core / regmap.c

diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c
index 519832f173307e95a9862e33679c9f0707218696..8a0e00ff9aa60c0a87db8cb2b66080ea25908b0f 100644 (file)
--- a/drivers/core/regmap.c
+++ b/drivers/core/regmap.c
@@ -8,62 +8,107 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <regmap.h>
+#include <asm/io.h>
+#include <dm/of_addr.h>
+#include <linux/ioport.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+static struct regmap *regmap_alloc_count(int count)
+{
+       struct regmap *map;
+
+       map = malloc(sizeof(struct regmap));
+       if (!map)
+               return NULL;
+       if (count <= 1) {
+               map->range = &map->base_range;
+       } else {
+               map->range = malloc(count * sizeof(struct regmap_range));
+               if (!map->range) {
+                       free(map);
+                       return NULL;
+               }
+       }
+       map->range_count = count;
+
+       return map;
+}
+
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
+int regmap_init_mem_platdata(struct udevice *dev, fdt_val_t *reg, int count,
+                            struct regmap **mapp)
+{
+       struct regmap_range *range;
+       struct regmap *map;
+
+       map = regmap_alloc_count(count);
+       if (!map)
+               return -ENOMEM;
+
+       map->base = *reg;
+       for (range = map->range; count > 0; reg += 2, range++, count--) {
+               range->start = *reg;
+               range->size = reg[1];
+       }
+
+       *mapp = map;
+
+       return 0;
+}
+#else
 int regmap_init_mem(struct udevice *dev, struct regmap **mapp)
 {
-       const void *blob = gd->fdt_blob;
        struct regmap_range *range;
-       const fdt32_t *cell;
        struct regmap *map;
        int count;
        int addr_len, size_len, both_len;
-       int parent;
        int len;
+       int index;
+       ofnode node = dev_ofnode(dev);
+       struct resource r;
 
-       parent = dev->parent->of_offset;
-       addr_len = fdt_address_cells(blob, parent);
-       size_len = fdt_size_cells(blob, parent);
+       addr_len = dev_read_simple_addr_cells(dev->parent);
+       size_len = dev_read_simple_size_cells(dev->parent);
        both_len = addr_len + size_len;
 
-       cell = fdt_getprop(blob, dev->of_offset, "reg", &len);
-       len /= sizeof(*cell);
+       len = dev_read_size(dev, "reg");
+       if (len < 0)
+               return len;
+       len /= sizeof(fdt32_t);
        count = len / both_len;
-       if (!cell || !count)
+       if (!count)
                return -EINVAL;
 
-       map = malloc(sizeof(struct regmap));
+       map = regmap_alloc_count(count);
        if (!map)
                return -ENOMEM;
 
-       if (count <= 1) {
-               map->range = &map->base_range;
-       } else {
-               map->range = malloc(count * sizeof(struct regmap_range));
-               if (!map->range) {
-                       free(map);
-                       return -ENOMEM;
+       for (range = map->range, index = 0; count > 0;
+            count--, range++, index++) {
+               fdt_size_t sz;
+               if (of_live_active()) {
+                       of_address_to_resource(ofnode_to_np(node), index, &r);
+                       range->start = r.start;
+                       range->size = r.end - r.start + 1;
+               } else {
+                       range->start = fdtdec_get_addr_size_fixed(gd->fdt_blob,
+                                       dev_of_offset(dev), "reg", index,
+                                       addr_len, size_len, &sz, true);
+                       range->size = sz;
                }
        }
-
-       map->base = fdtdec_get_number(cell, addr_len);
-       map->range_count = count;
-
-       for (range = map->range; count > 0;
-            count--, cell += both_len, range++) {
-               range->start = fdtdec_get_number(cell, addr_len);
-               range->size = fdtdec_get_number(cell + addr_len, size_len);
-       }
+       map->base = map->range[0].start;
 
        *mapp = map;
 
        return 0;
 }
+#endif
 
 void *regmap_get_range(struct regmap *map, unsigned int range_num)
 {
@@ -84,3 +129,21 @@ int regmap_uninit(struct regmap *map)
 
        return 0;
 }
+
+int regmap_read(struct regmap *map, uint offset, uint *valp)
+{
+       uint32_t *ptr = map_physmem(map->base + offset, 4, MAP_NOCACHE);
+
+       *valp = le32_to_cpu(readl(ptr));
+
+       return 0;
+}
+
+int regmap_write(struct regmap *map, uint offset, uint val)
+{
+       uint32_t *ptr = map_physmem(map->base + offset, 4, MAP_NOCACHE);
+
+       writel(cpu_to_le32(val), ptr);
+
+       return 0;
+}