mfd: max77693: Replace irqchip mask_invert with unmask_base

Remove use of the deprecated mask_invert flag. Inverted mask
registers (where a '1' bit enables an IRQ) can be described more
directly as an unmask register.

Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20221112151835.39059-8-aidanmacdonald.0x0@gmail.com

diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
index aa32e89b6c8e5a0fa4e75e0e348cde67c7f4f43a..3995e8769f491340c499404b19de1d97f50e4f86 100644 (file)
--- a/drivers/mfd/max77693.c
+++ b/drivers/mfd/max77693.c
@@ -66,7 +66,6 @@ static const struct regmap_irq_chip max77693_led_irq_chip = {
        .name                   = "max77693-led",
        .status_base            = MAX77693_LED_REG_FLASH_INT,
        .mask_base              = MAX77693_LED_REG_FLASH_INT_MASK,
-       .mask_invert            = false,
        .num_regs               = 1,
        .irqs                   = max77693_led_irqs,
        .num_irqs               = ARRAY_SIZE(max77693_led_irqs),
@@ -82,7 +81,6 @@ static const struct regmap_irq_chip max77693_topsys_irq_chip = {
        .name                   = "max77693-topsys",
        .status_base            = MAX77693_PMIC_REG_TOPSYS_INT,
        .mask_base              = MAX77693_PMIC_REG_TOPSYS_INT_MASK,
-       .mask_invert            = false,
        .num_regs               = 1,
        .irqs                   = max77693_topsys_irqs,
        .num_irqs               = ARRAY_SIZE(max77693_topsys_irqs),
@@ -100,7 +98,6 @@ static const struct regmap_irq_chip max77693_charger_irq_chip = {
        .name                   = "max77693-charger",
        .status_base            = MAX77693_CHG_REG_CHG_INT,
        .mask_base              = MAX77693_CHG_REG_CHG_INT_MASK,
-       .mask_invert            = false,
        .num_regs               = 1,
        .irqs                   = max77693_charger_irqs,
        .num_irqs               = ARRAY_SIZE(max77693_charger_irqs),
@@ -136,8 +133,7 @@ static const struct regmap_irq max77693_muic_irqs[] = {
 static const struct regmap_irq_chip max77693_muic_irq_chip = {
        .name                   = "max77693-muic",
        .status_base            = MAX77693_MUIC_REG_INT1,
-       .mask_base              = MAX77693_MUIC_REG_INTMASK1,
-       .mask_invert            = true,
+       .unmask_base            = MAX77693_MUIC_REG_INTMASK1,
        .num_regs               = 3,
        .irqs                   = max77693_muic_irqs,
        .num_irqs               = ARRAY_SIZE(max77693_muic_irqs),