Prepare v2018.07-rc1

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

diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c
index 7f21dee7e476e749891891b4e6a8f8b8bef02567..8e5c3bcf61bbc4927b2ccf577df927bafba1efb6 100644 (file)
--- a/drivers/core/regmap.c
+++ b/drivers/core/regmap.c
@@ -1,56 +1,46 @@
+// 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];
        }
@@ -60,42 +50,46 @@ int regmap_init_mem_platdata(struct udevice *dev, u32 *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)
 {
-       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_of_offset(dev->parent);
-       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(dev), "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;
 
-       for (range = map->range, index = 0; count > 0;
-            count--, cell += both_len, range++, index++) {
+       for (range = map->ranges, index = 0; count > 0;
+            count--, range++, index++) {
                fdt_size_t sz;
-               range->start = fdtdec_get_addr_size_fixed(blob,
-                               dev_of_offset(dev), "reg", index, addr_len,
-                               size_len, &sz, true);
-               range->size = 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;
+               }
        }
-       map->base = map->range[0].start;
 
        *mapp = map;
 
@@ -109,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;
@@ -125,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));
 
@@ -134,9 +126,23 @@ 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);
 
        return 0;
 }
+
+int regmap_update_bits(struct regmap *map, uint offset, uint mask, uint val)
+{
+       uint reg;
+       int ret;
+
+       ret = regmap_read(map, offset, &reg);
+       if (ret)
+               return ret;
+
+       reg &= ~mask;
+
+       return regmap_write(map, offset, reg | val);
+}