Commit acc247b2 authored by Aidan MacDonald's avatar Aidan MacDonald Committed by Lee Jones
Browse files

mfd: axp20x: 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: default avatarAidan MacDonald <aidanmacdonald.0x0@gmail.com>
Reviewed-by: default avatarSamuel Holland <samuel@sholland.org>
Tested-by: default avatarSamuel Holland <samuel@sholland.org>
Signed-off-by: default avatarLee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20221112151835.39059-4-aidanmacdonald.0x0@gmail.com
parent 3db3b9a5

drivers/mfd/axp20x.c

+7 −14
Original line number Diff line number Diff line
@@ -506,8 +506,7 @@ static const struct regmap_irq_chip axp152_regmap_irq_chip = { 
	.name			= "axp152_irq_chip",

	.status_base		= AXP152_IRQ1_STATE,

	.ack_base		= AXP152_IRQ1_STATE,

	.mask_base		= AXP152_IRQ1_EN,

	.mask_invert		= true,

	.unmask_base		= AXP152_IRQ1_EN,

	.init_ack_masked	= true,

	.irqs			= axp152_regmap_irqs,

	.num_irqs		= ARRAY_SIZE(axp152_regmap_irqs),
@@ -518,8 +517,7 @@ static const struct regmap_irq_chip axp20x_regmap_irq_chip = { 
	.name			= "axp20x_irq_chip",

	.status_base		= AXP20X_IRQ1_STATE,

	.ack_base		= AXP20X_IRQ1_STATE,

	.mask_base		= AXP20X_IRQ1_EN,

	.mask_invert		= true,

	.unmask_base		= AXP20X_IRQ1_EN,

	.init_ack_masked	= true,

	.irqs			= axp20x_regmap_irqs,

	.num_irqs		= ARRAY_SIZE(axp20x_regmap_irqs),
@@ -531,8 +529,7 @@ static const struct regmap_irq_chip axp22x_regmap_irq_chip = { 
	.name			= "axp22x_irq_chip",

	.status_base		= AXP20X_IRQ1_STATE,

	.ack_base		= AXP20X_IRQ1_STATE,

	.mask_base		= AXP20X_IRQ1_EN,

	.mask_invert		= true,

	.unmask_base		= AXP20X_IRQ1_EN,

	.init_ack_masked	= true,

	.irqs			= axp22x_regmap_irqs,

	.num_irqs		= ARRAY_SIZE(axp22x_regmap_irqs),
@@ -543,8 +540,7 @@ static const struct regmap_irq_chip axp288_regmap_irq_chip = { 
	.name			= "axp288_irq_chip",

	.status_base		= AXP20X_IRQ1_STATE,

	.ack_base		= AXP20X_IRQ1_STATE,

	.mask_base		= AXP20X_IRQ1_EN,

	.mask_invert		= true,

	.unmask_base		= AXP20X_IRQ1_EN,

	.init_ack_masked	= true,

	.irqs			= axp288_regmap_irqs,

	.num_irqs		= ARRAY_SIZE(axp288_regmap_irqs),
@@ -556,8 +552,7 @@ static const struct regmap_irq_chip axp803_regmap_irq_chip = { 
	.name			= "axp803",

	.status_base		= AXP20X_IRQ1_STATE,

	.ack_base		= AXP20X_IRQ1_STATE,

	.mask_base		= AXP20X_IRQ1_EN,

	.mask_invert		= true,

	.unmask_base		= AXP20X_IRQ1_EN,

	.init_ack_masked	= true,

	.irqs			= axp803_regmap_irqs,

	.num_irqs		= ARRAY_SIZE(axp803_regmap_irqs),
@@ -568,8 +563,7 @@ static const struct regmap_irq_chip axp806_regmap_irq_chip = { 
	.name			= "axp806",

	.status_base		= AXP20X_IRQ1_STATE,

	.ack_base		= AXP20X_IRQ1_STATE,

	.mask_base		= AXP20X_IRQ1_EN,

	.mask_invert		= true,

	.unmask_base		= AXP20X_IRQ1_EN,

	.init_ack_masked	= true,

	.irqs			= axp806_regmap_irqs,

	.num_irqs		= ARRAY_SIZE(axp806_regmap_irqs),
@@ -580,8 +574,7 @@ static const struct regmap_irq_chip axp809_regmap_irq_chip = { 
	.name			= "axp809",

	.status_base		= AXP20X_IRQ1_STATE,

	.ack_base		= AXP20X_IRQ1_STATE,

	.mask_base		= AXP20X_IRQ1_EN,

	.mask_invert		= true,

	.unmask_base		= AXP20X_IRQ1_EN,

	.init_ack_masked	= true,

	.irqs			= axp809_regmap_irqs,

	.num_irqs		= ARRAY_SIZE(axp809_regmap_irqs),