Merge tag 'driver-core-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / base / regmap / regmap-mmio.c

diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c
index 4410cb2d7d8206bf7eada6e69d4f8994b9a5026e..1e03e7f8bacb220a47d0edf29700f6a1814fc21e 100644 (file)
--- a/drivers/base/regmap/regmap-mmio.c
+++ b/drivers/base/regmap/regmap-mmio.c
@@ -25,10 +25,47 @@
 
 struct regmap_mmio_context {
        void __iomem *regs;
+       unsigned reg_bytes;
        unsigned val_bytes;
+       unsigned pad_bytes;
        struct clk *clk;
 };
 
+static inline void regmap_mmio_regsize_check(size_t reg_size)
+{
+       switch (reg_size) {
+       case 1:
+       case 2:
+       case 4:
+#ifdef CONFIG_64BIT
+       case 8:
+#endif
+               break;
+       default:
+               BUG();
+       }
+}
+
+static int regmap_mmio_regbits_check(size_t reg_bits)
+{
+       switch (reg_bits) {
+       case 8:
+       case 16:
+       case 32:
+#ifdef CONFIG_64BIT
+       case 64:
+#endif
+               return 0;
+       default:
+               return -EINVAL;
+       }
+}
+
+static inline void regmap_mmio_count_check(size_t count)
+{
+       BUG_ON(count % 2 != 0);
+}
+
 static int regmap_mmio_gather_write(void *context,
                                    const void *reg, size_t reg_size,
                                    const void *val, size_t val_size)
@@ -37,7 +74,7 @@ static int regmap_mmio_gather_write(void *context,
        u32 offset;
        int ret;
 
-       BUG_ON(reg_size != 4);
+       regmap_mmio_regsize_check(reg_size);
 
        if (!IS_ERR(ctx->clk)) {
                ret = clk_enable(ctx->clk);
@@ -80,9 +117,13 @@ static int regmap_mmio_gather_write(void *context,
 
 static int regmap_mmio_write(void *context, const void *data, size_t count)
 {
-       BUG_ON(count < 4);
+       struct regmap_mmio_context *ctx = context;
+       u32 offset = ctx->reg_bytes + ctx->pad_bytes;
+
+       regmap_mmio_count_check(count);
 
-       return regmap_mmio_gather_write(context, data, 4, data + 4, count - 4);
+       return regmap_mmio_gather_write(context, data, ctx->reg_bytes,
+                                       data + offset, count - offset);
 }
 
 static int regmap_mmio_read(void *context,
@@ -93,7 +134,7 @@ static int regmap_mmio_read(void *context,
        u32 offset;
        int ret;
 
-       BUG_ON(reg_size != 4);
+       regmap_mmio_regsize_check(reg_size);
 
        if (!IS_ERR(ctx->clk)) {
                ret = clk_enable(ctx->clk);
@@ -164,8 +205,9 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,
        int min_stride;
        int ret;
 
-       if (config->reg_bits != 32)
-               return ERR_PTR(-EINVAL);
+       ret = regmap_mmio_regbits_check(config->reg_bits);
+       if (ret)
+               return ERR_PTR(ret);
 
        if (config->pad_bits)
                return ERR_PTR(-EINVAL);
@@ -208,6 +250,8 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,
 
        ctx->regs = regs;
        ctx->val_bytes = config->val_bits / 8;
+       ctx->reg_bytes = config->reg_bits / 8;
+       ctx->pad_bytes = config->pad_bits / 8;
        ctx->clk = ERR_PTR(-ENODEV);
 
        if (clk_id == NULL)