Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next

[firefly-linux-kernel-4.4.55.git] / drivers / base / regmap / internal.h

diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index d141b80479b5257d9fff00b9be47e47029e0f163..abd76678ed7309036c3b1e6091422bfba2078659 100644 (file)
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -22,6 +22,7 @@ struct regcache_ops;
 struct regmap_format {
        size_t buf_size;
        size_t reg_bytes;
+       size_t pad_bytes;
        size_t val_bytes;
        void (*format_write)(struct regmap *map,
                             unsigned int reg, unsigned int val);
@@ -65,16 +66,16 @@ struct regmap {
        unsigned int num_reg_defaults_raw;
 
        /* if set, only the cache is modified not the HW */
-       unsigned int cache_only:1;
+       u32 cache_only;
        /* if set, only the HW is modified not the cache */
-       unsigned int cache_bypass:1;
+       u32 cache_bypass;
        /* if set, remember to free reg_defaults_raw */
-       unsigned int cache_free:1;
+       bool cache_free;
 
        struct reg_default *reg_defaults;
        const void *reg_defaults_raw;
        void *cache;
-       bool cache_dirty;
+       u32 cache_dirty;
 
        struct reg_default *patch;
        int patch_regs;