regmap: change regmap_init_mem() to take ofnode instead udevice

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

diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c
index 0f1d30820c693ac6def8a01650b62ac63541908c..fabcc5f53a838fb7bf1bc2a86f7cadfb0763e6e9 100644 (file)
--- a/drivers/core/regmap.c
+++ b/drivers/core/regmap.c
@@ -1,14 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2015 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #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>
@@ -18,22 +17,13 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static struct regmap *regmap_alloc_count(int count)
+static struct regmap *regmap_alloc(int count)
 {
        struct regmap *map;
 
-       map = malloc(sizeof(struct regmap));
+       map = malloc(sizeof(*map) + sizeof(map->ranges[0]) * count);
        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;
@@ -46,12 +36,11 @@ int regmap_init_mem_platdata(struct udevice *dev, fdt_val_t *reg, int count,
        struct regmap_range *range;
        struct regmap *map;
 
-       map = regmap_alloc_count(count);
+       map = regmap_alloc(count);
        if (!map)
                return -ENOMEM;
 
-       map->base = *reg;
-       for (range = map->range; count > 0; reg += 2, range++, count--) {
+       for (range = map->ranges; count > 0; reg += 2, range++, count--) {
                range->start = *reg;
                range->size = reg[1];
        }
@@ -61,7 +50,7 @@ int regmap_init_mem_platdata(struct udevice *dev, fdt_val_t *reg, int count,
        return 0;
 }
 #else
-int regmap_init_mem(struct udevice *dev, struct regmap **mapp)
+int regmap_init_mem(ofnode node, struct regmap **mapp)
 {
        struct regmap_range *range;
        struct regmap *map;
@@ -69,14 +58,13 @@ int regmap_init_mem(struct udevice *dev, struct regmap **mapp)
        int addr_len, size_len, both_len;
        int len;
        int index;
-       ofnode node = dev_ofnode(dev);
        struct resource r;
 
-       addr_len = dev_read_simple_addr_cells(dev->parent);
-       size_len = dev_read_simple_size_cells(dev->parent);
+       addr_len = ofnode_read_simple_addr_cells(ofnode_get_parent(node));
+       size_len = ofnode_read_simple_size_cells(ofnode_get_parent(node));
        both_len = addr_len + size_len;
 
-       len = dev_read_size(dev, "reg");
+       len = ofnode_read_size(node, "reg");
        if (len < 0)
                return len;
        len /= sizeof(fdt32_t);
@@ -84,11 +72,11 @@ int regmap_init_mem(struct udevice *dev, struct regmap **mapp)
        if (!count)
                return -EINVAL;
 
-       map = regmap_alloc_count(count);
+       map = regmap_alloc(count);
        if (!map)
                return -ENOMEM;
 
-       for (range = map->range, index = 0; count > 0;
+       for (range = map->ranges, index = 0; count > 0;
             count--, range++, index++) {
                fdt_size_t sz;
                if (of_live_active()) {
@@ -97,12 +85,11 @@ int regmap_init_mem(struct udevice *dev, struct regmap **mapp)
                        range->size = r.end - r.start + 1;
                } else {
                        range->start = fdtdec_get_addr_size_fixed(gd->fdt_blob,
-                                       dev_of_offset(dev), "reg", index,
+                                       ofnode_to_offset(node), "reg", index,
                                        addr_len, size_len, &sz, true);
                        range->size = sz;
                }
        }
-       map->base = map->range[0].start;
 
        *mapp = map;
 
@@ -116,15 +103,13 @@ void *regmap_get_range(struct regmap *map, unsigned int range_num)
 
        if (range_num >= map->range_count)
                return NULL;
-       range = &map->range[range_num];
+       range = &map->ranges[range_num];
 
        return map_sysmem(range->start, range->size);
 }
 
 int regmap_uninit(struct regmap *map)
 {
-       if (map->range_count > 1)
-               free(map->range);
        free(map);
 
        return 0;
@@ -132,7 +117,7 @@ int regmap_uninit(struct regmap *map)
 
 int regmap_read(struct regmap *map, uint offset, uint *valp)
 {
-       uint32_t *ptr = map_physmem(map->base + offset, 4, MAP_NOCACHE);
+       u32 *ptr = map_physmem(map->ranges[0].start + offset, 4, MAP_NOCACHE);
 
        *valp = le32_to_cpu(readl(ptr));
 
@@ -141,7 +126,7 @@ int regmap_read(struct regmap *map, uint offset, uint *valp)
 
 int regmap_write(struct regmap *map, uint offset, uint val)
 {
-       uint32_t *ptr = map_physmem(map->base + offset, 4, MAP_NOCACHE);
+       u32 *ptr = map_physmem(map->ranges[0].start + offset, 4, MAP_NOCACHE);
 
        writel(cpu_to_le32(val), ptr);