usb: ehci-atmel: Remove unnecessary clock calling

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

diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c
index 519832f173307e95a9862e33679c9f0707218696..c68bcba54f1e5cfd750ec854f5c12b1a6096b214 100644 (file)
--- a/drivers/core/regmap.c
+++ b/drivers/core/regmap.c
@@ -13,8 +13,53 @@
 #include <mapmem.h>
 #include <regmap.h>
 
+#include <asm/io.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, u32 *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;
@@ -37,22 +82,11 @@ int regmap_init_mem(struct udevice *dev, struct regmap **mapp)
        if (!cell || !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;
-               }
-       }
-
        map->base = fdtdec_get_number(cell, addr_len);
-       map->range_count = count;
 
        for (range = map->range; count > 0;
             count--, cell += both_len, range++) {
@@ -64,6 +98,7 @@ int regmap_init_mem(struct udevice *dev, struct regmap **mapp)
 
        return 0;
 }
+#endif
 
 void *regmap_get_range(struct regmap *map, unsigned int range_num)
 {
@@ -84,3 +119,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;
+}