regmap: Add bypassed version of regmap_multi_reg_write
[deliverable/linux.git] / drivers / base / regmap / regmap.c
index c2e00210094995fde1cc69998d03f98e01c75fb1..e6a2c29c0be4f8896dae53eeaafcc3226c6aa011 100644 (file)
@@ -1514,21 +1514,49 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
 {
        int ret = 0, i;
        size_t val_bytes = map->format.val_bytes;
-       void *wval;
 
-       if (!map->bus)
-               return -EINVAL;
-       if (!map->format.parse_inplace)
+       if (map->bus && !map->format.parse_inplace)
                return -EINVAL;
        if (reg % map->reg_stride)
                return -EINVAL;
 
        map->lock(map->lock_arg);
+       /*
+        * Some devices don't support bulk write, for
+        * them we have a series of single write operations.
+        */
+       if (!map->bus || map->use_single_rw) {
+               for (i = 0; i < val_count; i++) {
+                       unsigned int ival;
 
-       /* No formatting is require if val_byte is 1 */
-       if (val_bytes == 1) {
-               wval = (void *)val;
+                       switch (val_bytes) {
+                       case 1:
+                               ival = *(u8 *)(val + (i * val_bytes));
+                               break;
+                       case 2:
+                               ival = *(u16 *)(val + (i * val_bytes));
+                               break;
+                       case 4:
+                               ival = *(u32 *)(val + (i * val_bytes));
+                               break;
+#ifdef CONFIG_64BIT
+                       case 8:
+                               ival = *(u64 *)(val + (i * val_bytes));
+                               break;
+#endif
+                       default:
+                               ret = -EINVAL;
+                               goto out;
+                       }
+
+                       ret = _regmap_write(map, reg + (i * map->reg_stride),
+                                       ival);
+                       if (ret != 0)
+                               goto out;
+               }
        } else {
+               void *wval;
+
                wval = kmemdup(val, val_count * val_bytes, GFP_KERNEL);
                if (!wval) {
                        ret = -ENOMEM;
@@ -1537,33 +1565,37 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
                }
                for (i = 0; i < val_count * val_bytes; i += val_bytes)
                        map->format.parse_inplace(wval + i);
-       }
-       /*
-        * Some devices does not support bulk write, for
-        * them we have a series of single write operations.
-        */
-       if (map->use_single_rw) {
-               for (i = 0; i < val_count; i++) {
-                       ret = _regmap_raw_write(map,
-                                               reg + (i * map->reg_stride),
-                                               val + (i * val_bytes),
-                                               val_bytes);
-                       if (ret != 0)
-                               goto out;
-               }
-       } else {
+
                ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count);
-       }
 
-       if (val_bytes != 1)
                kfree(wval);
-
+       }
 out:
        map->unlock(map->lock_arg);
        return ret;
 }
 EXPORT_SYMBOL_GPL(regmap_bulk_write);
 
+static int _regmap_multi_reg_write(struct regmap *map,
+                                  const struct reg_default *regs,
+                                  int num_regs)
+{
+       int i, ret;
+
+       for (i = 0; i < num_regs; i++) {
+               if (regs[i].reg % map->reg_stride)
+                       return -EINVAL;
+               ret = _regmap_write(map, regs[i].reg, regs[i].def);
+               if (ret != 0) {
+                       dev_err(map->dev, "Failed to write %x = %x: %d\n",
+                               regs[i].reg, regs[i].def, ret);
+                       return ret;
+               }
+       }
+
+       return 0;
+}
+
 /*
  * regmap_multi_reg_write(): Write multiple registers to the device
  *
@@ -1580,31 +1612,60 @@ EXPORT_SYMBOL_GPL(regmap_bulk_write);
  * A value of zero will be returned on success, a negative errno will
  * be returned in error cases.
  */
-int regmap_multi_reg_write(struct regmap *map, struct reg_default *regs,
-                               int num_regs)
+int regmap_multi_reg_write(struct regmap *map, const struct reg_default *regs,
+                          int num_regs)
 {
-       int ret = 0, i;
-
-       for (i = 0; i < num_regs; i++) {
-               int reg = regs[i].reg;
-               if (reg % map->reg_stride)
-                       return -EINVAL;
-       }
+       int ret;
 
        map->lock(map->lock_arg);
 
-       for (i = 0; i < num_regs; i++) {
-               ret = _regmap_write(map, regs[i].reg, regs[i].def);
-               if (ret != 0)
-                       goto out;
-       }
-out:
+       ret = _regmap_multi_reg_write(map, regs, num_regs);
+
        map->unlock(map->lock_arg);
 
        return ret;
 }
 EXPORT_SYMBOL_GPL(regmap_multi_reg_write);
 
+/*
+ * regmap_multi_reg_write_bypassed(): Write multiple registers to the
+ *                                    device but not the cache
+ *
+ * where the set of register are supplied in any order
+ *
+ * @map: Register map to write to
+ * @regs: Array of structures containing register,value to be written
+ * @num_regs: Number of registers to write
+ *
+ * This function is intended to be used for writing a large block of data
+ * atomically to the device in single transfer for those I2C client devices
+ * that implement this alternative block write mode.
+ *
+ * A value of zero will be returned on success, a negative errno will
+ * be returned in error cases.
+ */
+int regmap_multi_reg_write_bypassed(struct regmap *map,
+                                   const struct reg_default *regs,
+                                   int num_regs)
+{
+       int ret;
+       bool bypass;
+
+       map->lock(map->lock_arg);
+
+       bypass = map->cache_bypass;
+       map->cache_bypass = true;
+
+       ret = _regmap_multi_reg_write(map, regs, num_regs);
+
+       map->cache_bypass = bypass;
+
+       map->unlock(map->lock_arg);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(regmap_multi_reg_write_bypassed);
+
 /**
  * regmap_raw_write_async(): Write raw values to one or more registers
  *                           asynchronously
@@ -1897,14 +1958,10 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,
        size_t val_bytes = map->format.val_bytes;
        bool vol = regmap_volatile_range(map, reg, val_count);
 
-       if (!map->bus)
-               return -EINVAL;
-       if (!map->format.parse_inplace)
-               return -EINVAL;
        if (reg % map->reg_stride)
                return -EINVAL;
 
-       if (vol || map->cache_type == REGCACHE_NONE) {
+       if (map->bus && map->format.parse_inplace && (vol || map->cache_type == REGCACHE_NONE)) {
                /*
                 * Some devices does not support bulk read, for
                 * them we have a series of single read operations.
@@ -2173,6 +2230,10 @@ int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
        int i, ret;
        bool bypass;
 
+       if (WARN_ONCE(num_regs <= 0, "invalid registers number (%d)\n",
+           num_regs))
+               return 0;
+
        map->lock(map->lock_arg);
 
        bypass = map->cache_bypass;
@@ -2182,6 +2243,10 @@ int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
 
        /* Write out first; it's useful to apply even if we fail later. */
        for (i = 0; i < num_regs; i++) {
+               if (regs[i].reg % map->reg_stride) {
+                       ret = -EINVAL;
+                       goto out;
+               }
                ret = _regmap_write(map, regs[i].reg, regs[i].def);
                if (ret != 0) {
                        dev_err(map->dev, "Failed to write %x = %x: %d\n",
This page took 0.027447 seconds and 5 git commands to generate.