mfd: max77836: Add MAX77836 support to max14577 driver

Add Maxim 77836 support to max14577 driver. The chipsets have same MUIC
component so the extcon, charger and regulators are almost the same. The
MAX77836 however has also PMIC and Fuel Gauge.

The MAX77836 uses three I2C slave addresses and has additional interrupts
(related to PMIC and Fuel Gauge). It has also Interrupt Source register,
just like MAX77686 and MAX77693.

The MAX77836 PMIC's TOPSYS and INTSRC interrupts are reported in the
PMIC block. The PMIC block has different I2C slave address and uses own
regmap so another regmap_irq_chip is needed.

Since we have two regmap_irq_chip, use shared interrupts on MAX77836.

This patch adds additional defines and functions to the max14577 MFD core
driver so the driver will handle both chipsets. Also this patch replaces
"0x1 << N" with BIT(N) in defines for register masks.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

1 files changed, 209 insertions, 8 deletions

diff --git a/drivers/mfd/max14577.c b/drivers/mfd/max14577.c
index 6f39dec9dfdf..20e3b2d81bf0 100644
--- a/drivers/mfd/max14577.c
+++ b/drivers/mfd/max14577.c
@@ -1,7 +1,7 @@
 /*
- * max14577.c - mfd core driver for the Maxim 14577
+ * max14577.c - mfd core driver for the Maxim 14577/77836
  *
- * Copyright (C) 2013 Samsung Electrnoics
+ * Copyright (C) 2014 Samsung Electrnoics
  * Chanwoo Choi <cw00.choi@samsung.com>
  * Krzysztof Kozlowski <k.kozlowski@samsung.com>
  *
@@ -38,11 +38,34 @@ static struct mfd_cell max14577_devs[] = {
         { .name = "max14577-charger", },
 };
 
+static struct mfd_cell max77836_devs[] = {
+        {
+                .name = "max77836-muic",
+                .of_compatible = "maxim,max77836-muic",
+        },
+        {
+                .name = "max77836-regulator",
+                .of_compatible = "maxim,max77836-regulator",
+        },
+        {
+                .name = "max77836-charger",
+                .of_compatible = "maxim,max77836-charger",
+        },
+        {
+                .name = "max77836-battery",
+                .of_compatible = "maxim,max77836-battery",
+        },
+};
+
 static struct of_device_id max14577_dt_match[] = {
         {
                 .compatible = "maxim,max14577",
                 .data = (void *)MAXIM_DEVICE_TYPE_MAX14577,
         },
+        {
+                .compatible = "maxim,max77836",
+                .data = (void *)MAXIM_DEVICE_TYPE_MAX77836,
+        },
         {},
 };
 
@@ -57,6 +80,26 @@ static bool max14577_muic_volatile_reg(struct device *dev, unsigned int reg)
         return false;
 }
 
+static bool max77836_muic_volatile_reg(struct device *dev, unsigned int reg)
+{
+        /* Any max14577 volatile registers are also max77836 volatile. */
+        if (max14577_muic_volatile_reg(dev, reg))
+                return true;
+
+        switch (reg) {
+        case MAX77836_FG_REG_VCELL_MSB ... MAX77836_FG_REG_SOC_LSB:
+        case MAX77836_FG_REG_CRATE_MSB ... MAX77836_FG_REG_CRATE_LSB:
+        case MAX77836_FG_REG_STATUS_H ... MAX77836_FG_REG_STATUS_L:
+        case MAX77836_PMIC_REG_INTSRC:
+        case MAX77836_PMIC_REG_TOPSYS_INT:
+        case MAX77836_PMIC_REG_TOPSYS_STAT:
+                return true;
+        default:
+                break;
+        }
+        return false;
+}
+
 static const struct regmap_config max14577_muic_regmap_config = {
         .reg_bits       = 8,
         .val_bits       = 8,
@@ -64,6 +107,13 @@ static const struct regmap_config max14577_muic_regmap_config = {
         .max_register   = MAX14577_REG_END,
 };
 
+static const struct regmap_config max77836_pmic_regmap_config = {
+        .reg_bits       = 8,
+        .val_bits       = 8,
+        .volatile_reg   = max77836_muic_volatile_reg,
+        .max_register   = MAX77836_PMIC_REG_END,
+};
+
 static const struct regmap_irq max14577_irqs[] = {
         /* INT1 interrupts */
         { .reg_offset = 0, .mask = MAX14577_INT1_ADC_MASK, },
@@ -86,12 +136,56 @@ static const struct regmap_irq_chip max14577_irq_chip = {
         .name                   = "max14577",
         .status_base            = MAX14577_REG_INT1,
         .mask_base              = MAX14577_REG_INTMASK1,
-        .mask_invert            = 1,
+        .mask_invert            = true,
         .num_regs               = 3,
         .irqs                   = max14577_irqs,
         .num_irqs               = ARRAY_SIZE(max14577_irqs),
 };
 
+static const struct regmap_irq max77836_muic_irqs[] = {
+        /* INT1 interrupts */
+        { .reg_offset = 0, .mask = MAX14577_INT1_ADC_MASK, },
+        { .reg_offset = 0, .mask = MAX14577_INT1_ADCLOW_MASK, },
+        { .reg_offset = 0, .mask = MAX14577_INT1_ADCERR_MASK, },
+        /* INT2 interrupts */
+        { .reg_offset = 1, .mask = MAX14577_INT2_CHGTYP_MASK, },
+        { .reg_offset = 1, .mask = MAX14577_INT2_CHGDETRUN_MASK, },
+        { .reg_offset = 1, .mask = MAX14577_INT2_DCDTMR_MASK, },
+        { .reg_offset = 1, .mask = MAX14577_INT2_DBCHG_MASK, },
+        { .reg_offset = 1, .mask = MAX14577_INT2_VBVOLT_MASK, },
+        { .reg_offset = 1, .mask = MAX77836_INT2_VIDRM_MASK, },
+        /* INT3 interrupts */
+        { .reg_offset = 2, .mask = MAX14577_INT3_EOC_MASK, },
+        { .reg_offset = 2, .mask = MAX14577_INT3_CGMBC_MASK, },
+        { .reg_offset = 2, .mask = MAX14577_INT3_OVP_MASK, },
+        { .reg_offset = 2, .mask = MAX14577_INT3_MBCCHGERR_MASK, },
+};
+
+static const struct regmap_irq_chip max77836_muic_irq_chip = {
+        .name                   = "max77836-muic",
+        .status_base            = MAX14577_REG_INT1,
+        .mask_base              = MAX14577_REG_INTMASK1,
+        .mask_invert            = true,
+        .num_regs               = 3,
+        .irqs                   = max77836_muic_irqs,
+        .num_irqs               = ARRAY_SIZE(max77836_muic_irqs),
+};
+
+static const struct regmap_irq max77836_pmic_irqs[] = {
+        { .reg_offset = 0, .mask = MAX77836_TOPSYS_INT_T120C_MASK, },
+        { .reg_offset = 0, .mask = MAX77836_TOPSYS_INT_T140C_MASK, },
+};
+
+static const struct regmap_irq_chip max77836_pmic_irq_chip = {
+        .name                   = "max77836-pmic",
+        .status_base            = MAX77836_PMIC_REG_TOPSYS_INT,
+        .mask_base              = MAX77836_PMIC_REG_TOPSYS_INT_MASK,
+        .mask_invert            = false,
+        .num_regs               = 1,
+        .irqs                   = max77836_pmic_irqs,
+        .num_irqs               = ARRAY_SIZE(max77836_pmic_irqs),
+};
+
 static void max14577_print_dev_type(struct max14577 *max14577)
 {
         u8 reg_data, vendor_id, device_id;
@@ -114,6 +208,81 @@ static void max14577_print_dev_type(struct max14577 *max14577)
                         max14577->dev_type, device_id, vendor_id);
 }
 
+/*
+ * Max77836 specific initialization code for driver probe.
+ * Adds new I2C dummy device, regmap and regmap IRQ chip.
+ * Unmasks Interrupt Source register.
+ *
+ * On success returns 0.
+ * On failure returns errno and reverts any changes done so far (e.g. remove
+ * I2C dummy device), except masking the INT SRC register.
+ */
+static int max77836_init(struct max14577 *max14577)
+{
+        int ret;
+        u8 intsrc_mask;
+
+        max14577->i2c_pmic = i2c_new_dummy(max14577->i2c->adapter,
+                        I2C_ADDR_PMIC);
+        if (!max14577->i2c_pmic) {
+                dev_err(max14577->dev, "Failed to register PMIC I2C device\n");
+                return -ENODEV;
+        }
+        i2c_set_clientdata(max14577->i2c_pmic, max14577);
+
+        max14577->regmap_pmic = devm_regmap_init_i2c(max14577->i2c_pmic,
+                        &max77836_pmic_regmap_config);
+        if (IS_ERR(max14577->regmap_pmic)) {
+                ret = PTR_ERR(max14577->regmap_pmic);
+                dev_err(max14577->dev, "Failed to allocate PMIC register map: %d\n",
+                                ret);
+                goto err;
+        }
+
+        /* Un-mask MAX77836 Interrupt Source register */
+        ret = max14577_read_reg(max14577->regmap_pmic,
+                        MAX77836_PMIC_REG_INTSRC_MASK, &intsrc_mask);
+        if (ret < 0) {
+                dev_err(max14577->dev, "Failed to read PMIC register\n");
+                goto err;
+        }
+
+        intsrc_mask &= ~(MAX77836_INTSRC_MASK_TOP_INT_MASK);
+        intsrc_mask &= ~(MAX77836_INTSRC_MASK_MUIC_CHG_INT_MASK);
+        ret = max14577_write_reg(max14577->regmap_pmic,
+                        MAX77836_PMIC_REG_INTSRC_MASK, intsrc_mask);
+        if (ret < 0) {
+                dev_err(max14577->dev, "Failed to write PMIC register\n");
+                goto err;
+        }
+
+        ret = regmap_add_irq_chip(max14577->regmap_pmic, max14577->irq,
+                        IRQF_TRIGGER_FALLING | IRQF_ONESHOT | IRQF_SHARED,
+                        0, &max77836_pmic_irq_chip,
+                        &max14577->irq_data_pmic);
+        if (ret != 0) {
+                dev_err(max14577->dev, "Failed to request PMIC IRQ %d: %d\n",
+                                max14577->irq, ret);
+                goto err;
+        }
+
+        return 0;
+
+err:
+        i2c_unregister_device(max14577->i2c_pmic);
+
+        return ret;
+}
+
+/*
+ * Max77836 specific de-initialization code for driver remove.
+ */
+static void max77836_remove(struct max14577 *max14577)
+{
+        regmap_del_irq_chip(max14577->irq, max14577->irq_data_pmic);
+        i2c_unregister_device(max14577->i2c_pmic);
+}
+
 static int max14577_i2c_probe(struct i2c_client *i2c,
                               const struct i2c_device_id *id)
 {
@@ -121,6 +290,10 @@ static int max14577_i2c_probe(struct i2c_client *i2c,
         struct max14577_platform_data *pdata = dev_get_platdata(&i2c->dev);
         struct device_node *np = i2c->dev.of_node;
         int ret = 0;
+        const struct regmap_irq_chip *irq_chip;
+        struct mfd_cell *mfd_devs;
+        unsigned int mfd_devs_size;
+        int irq_flags;
 
         if (np) {
                 pdata = devm_kzalloc(&i2c->dev, sizeof(*pdata), GFP_KERNEL);
@@ -164,9 +337,24 @@ static int max14577_i2c_probe(struct i2c_client *i2c,
 
         max14577_print_dev_type(max14577);
 
+        switch (max14577->dev_type) {
+        case MAXIM_DEVICE_TYPE_MAX77836:
+                irq_chip = &max77836_muic_irq_chip;
+                mfd_devs = max77836_devs;
+                mfd_devs_size = ARRAY_SIZE(max77836_devs);
+                irq_flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT | IRQF_SHARED;
+                break;
+        case MAXIM_DEVICE_TYPE_MAX14577:
+        default:
+                irq_chip = &max14577_irq_chip;
+                mfd_devs = max14577_devs;
+                mfd_devs_size = ARRAY_SIZE(max14577_devs);
+                irq_flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;
+                break;
+        }
+
         ret = regmap_add_irq_chip(max14577->regmap, max14577->irq,
-                                  IRQF_TRIGGER_FALLING | IRQF_ONESHOT, 0,
-                                  &max14577_irq_chip,
+                                  irq_flags, 0, irq_chip,
                                   &max14577->irq_data);
         if (ret != 0) {
                 dev_err(&i2c->dev, "Failed to request IRQ %d: %d\n",
@@ -174,8 +362,15 @@ static int max14577_i2c_probe(struct i2c_client *i2c,
                 return ret;
         }
 
-        ret = mfd_add_devices(max14577->dev, -1, max14577_devs,
-                        ARRAY_SIZE(max14577_devs), NULL, 0,
+        /* Max77836 specific initialization code (additional regmap) */
+        if (max14577->dev_type == MAXIM_DEVICE_TYPE_MAX77836) {
+                ret = max77836_init(max14577);
+                if (ret < 0)
+                        goto err_max77836;
+        }
+
+        ret = mfd_add_devices(max14577->dev, -1, mfd_devs,
+                        mfd_devs_size, NULL, 0,
                         regmap_irq_get_domain(max14577->irq_data));
         if (ret < 0)
                 goto err_mfd;
@@ -185,6 +380,9 @@ static int max14577_i2c_probe(struct i2c_client *i2c,
         return 0;
 
 err_mfd:
+        if (max14577->dev_type == MAXIM_DEVICE_TYPE_MAX77836)
+                max77836_remove(max14577);
+err_max77836:
         regmap_del_irq_chip(max14577->irq, max14577->irq_data);
 
         return ret;
@@ -196,12 +394,15 @@ static int max14577_i2c_remove(struct i2c_client *i2c)
 
         mfd_remove_devices(max14577->dev);
         regmap_del_irq_chip(max14577->irq, max14577->irq_data);
+        if (max14577->dev_type == MAXIM_DEVICE_TYPE_MAX77836)
+                max77836_remove(max14577);
 
         return 0;
 }
 
 static const struct i2c_device_id max14577_i2c_id[] = {
         { "max14577", MAXIM_DEVICE_TYPE_MAX14577, },
+        { "max77836", MAXIM_DEVICE_TYPE_MAX77836, },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, max14577_i2c_id);
@@ -274,5 +475,5 @@ static void __exit max14577_i2c_exit(void)
 module_exit(max14577_i2c_exit);
 
 MODULE_AUTHOR("Chanwoo Choi <cw00.choi@samsung.com>, Krzysztof Kozlowski <k.kozlowski@samsung.com>");
-MODULE_DESCRIPTION("MAXIM 14577 multi-function core driver");
+MODULE_DESCRIPTION("Maxim 14577/77836 multi-function core driver");
 MODULE_LICENSE("GPL");