]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'regmap/topic/24bit' into regmap-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 14 Feb 2013 17:11:00 +0000 (17:11 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 14 Feb 2013 17:11:00 +0000 (17:11 +0000)
1  2 
drivers/base/regmap/regmap.c

index f00b059c057ad01e4c8b9f05e95676c3c53c0e79,26af93a2595d214c8f3e82def3093fa5d2b5f406..dc19026d28e96ee5800f146fe9dea9b0eb0d74b5
@@@ -500,6 -500,12 +500,12 @@@ struct regmap *regmap_init(struct devic
                }
                break;
  
+       case 24:
+               if (reg_endian != REGMAP_ENDIAN_BIG)
+                       goto err_map;
+               map->format.format_reg = regmap_format_24;
+               break;
        case 32:
                switch (reg_endian) {
                case REGMAP_ENDIAN_BIG:
@@@ -1106,7 -1112,7 +1112,7 @@@ EXPORT_SYMBOL_GPL(regmap_raw_write)
   * @val_count: Number of registers to write
   *
   * This function is intended to be used for writing a large block of
 - * data to be device either in single transfer or multiple transfer.
 + * data to the device either in single transfer or multiple transfer.
   *
   * A value of zero will be returned on success, a negative errno will
   * be returned in error cases.