+// 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>
-
#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)
+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;
}
#if CONFIG_IS_ENABLED(OF_PLATDATA)
-int regmap_init_mem_platdata(struct udevice *dev, u32 *reg, int count,
+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);
+ 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];
}
return 0;
}
#else
-int regmap_init_mem(struct udevice *dev, struct regmap **mapp)
+int regmap_init_mem(ofnode node, 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;
+ struct resource r;
- parent = dev->parent->of_offset;
- addr_len = fdt_address_cells(blob, parent);
- size_len = fdt_size_cells(blob, 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;
- cell = fdt_getprop(blob, dev->of_offset, "reg", &len);
- len /= sizeof(*cell);
+ len = ofnode_read_size(node, "reg");
+ if (len < 0)
+ return len;
+ len /= sizeof(fdt32_t);
count = len / both_len;
- if (!cell || !count)
+ if (!count)
return -EINVAL;
- map = regmap_alloc_count(count);
+ map = regmap_alloc(count);
if (!map)
return -ENOMEM;
- map->base = fdtdec_get_number(cell, addr_len);
-
- 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);
+ for (range = map->ranges, 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,
+ ofnode_to_offset(node), "reg", index,
+ addr_len, size_len, &sz, true);
+ range->size = sz;
+ }
}
*mapp = map;
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;
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));
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);