Unverified Commit c18b6c18 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Cleanup deprecated regmap-irq functionality 

Merge series from Aidan MacDonald <aidanmacdonald.0x0@gmail.com>:

Update two ASoC codec drivers to remove uses of regmap-irq type
registers, which have recently been deprecated by the "regmap-irq
cleanups and refactoring" series in linux-next.

Link: https://lore.kernel.org/lkml/20220623211420.918875-1-aidanmacdonald.0x0@gmail.com/
parents 6bbabd28 de3287f1

sound/soc/codecs/wcd9335.c

+8 −2
Original line number Diff line number Diff line
@@ -5013,16 +5013,22 @@ static const struct regmap_irq wcd9335_codec_irqs[] = { 
	},

};



static const unsigned int wcd9335_config_regs[] = {

	WCD9335_INTR_LEVEL0,

};



static const struct regmap_irq_chip wcd9335_regmap_irq1_chip = {

	.name = "wcd9335_pin1_irq",

	.status_base = WCD9335_INTR_PIN1_STATUS0,

	.mask_base = WCD9335_INTR_PIN1_MASK0,

	.ack_base = WCD9335_INTR_PIN1_CLEAR0,

	.type_base = WCD9335_INTR_LEVEL0,

	.num_type_reg = 4,

	.num_regs = 4,

	.irqs = wcd9335_codec_irqs,

	.num_irqs = ARRAY_SIZE(wcd9335_codec_irqs),

	.config_base = wcd9335_config_regs,

	.num_config_bases = ARRAY_SIZE(wcd9335_config_regs),

	.num_config_regs = 4,

	.set_type_config = regmap_irq_set_type_config_simple,

};



static int wcd9335_parse_dt(struct wcd9335_codec *wcd)

sound/soc/codecs/wcd938x.c

+0 −1
Original line number Diff line number Diff line
@@ -1298,7 +1298,6 @@ static struct regmap_irq_chip wcd938x_regmap_irq_chip = { 
	.num_regs = 3,

	.status_base = WCD938X_DIGITAL_INTR_STATUS_0,

	.mask_base = WCD938X_DIGITAL_INTR_MASK_0,

	.type_base = WCD938X_DIGITAL_INTR_LEVEL_0,

	.ack_base = WCD938X_DIGITAL_INTR_CLEAR_0,

	.use_ack = 1,

	.runtime_pm = true,