Merge branch 'clk-fixes' into clk-next

[cascardo/linux.git] / drivers / mfd / tps6586x.c

diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index e0a2583..5628a6b 100644 (file)
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -52,7 +52,7 @@
 #define TPS6586X_VERSIONCRC    0xcd
 
 /* Maximum register */
-#define TPS6586X_MAX_REGISTER  (TPS6586X_VERSIONCRC + 1)
+#define TPS6586X_MAX_REGISTER  TPS6586X_VERSIONCRC
 
 struct tps6586x_irq_data {
        u8      mask_reg;
@@ -299,14 +299,7 @@ static int tps6586x_irq_map(struct irq_domain *h, unsigned int virq,
        irq_set_chip_data(virq, tps6586x);
        irq_set_chip_and_handler(virq, &tps6586x_irq_chip, handle_simple_irq);
        irq_set_nested_thread(virq, 1);
-
-       /* ARM needs us to explicitly flag the IRQ as valid
-        * and will set them noprobe when we do so. */
-#ifdef CONFIG_ARM
-       set_irq_flags(virq, IRQF_VALID);
-#else
        irq_set_noprobe(virq);
-#endif
 
        return 0;
 }
@@ -467,7 +460,7 @@ static bool is_volatile_reg(struct device *dev, unsigned int reg)
 static const struct regmap_config tps6586x_regmap_config = {
        .reg_bits = 8,
        .val_bits = 8,
-       .max_register = TPS6586X_MAX_REGISTER - 1,
+       .max_register = TPS6586X_MAX_REGISTER,
        .volatile_reg = is_volatile_reg,
        .cache_type = REGCACHE_RBTREE,
 };
@@ -610,7 +603,6 @@ MODULE_DEVICE_TABLE(i2c, tps6586x_id_table);
 static struct i2c_driver tps6586x_driver = {
        .driver = {
                .name   = "tps6586x",
-               .owner  = THIS_MODULE,
                .of_match_table = of_match_ptr(tps6586x_of_match),
        },
        .probe          = tps6586x_i2c_probe,