Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b84cf427 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd9xxx: Correct OCP IRQ mapping for Tapan"

parents e5328d02 93fc4a42

drivers/mfd/wcd9xxx-core.c

+2 −0
Original line number Diff line number Diff line
@@ -544,8 +544,10 @@ static const struct intr_data intr_tbl_v2[] = { 
	{WCD9XXX_IRQ_PA2_STARTUP, false},

	{WCD9XXX_IRQ_PA3_STARTUP, false},

	{WCD9XXX_IRQ_PA4_STARTUP, false},

	{WCD9306_IRQ_HPH_PA_OCPR_FAULT, false},

	{WCD9XXX_IRQ_PA5_STARTUP, false},

	{WCD9XXX_IRQ_MICBIAS1_PRECHARGE, false},

	{WCD9306_IRQ_HPH_PA_OCPL_FAULT, false},

	{WCD9XXX_IRQ_MICBIAS2_PRECHARGE, false},

	{WCD9XXX_IRQ_MICBIAS3_PRECHARGE, false},

	{WCD9XXX_IRQ_HPH_PA_OCPL_FAULT, false},

include/linux/mfd/wcd9xxx/core.h

+2 −0
Original line number Diff line number Diff line
@@ -64,8 +64,10 @@ enum { 
	WCD9XXX_IRQ_PA2_STARTUP,

	WCD9XXX_IRQ_PA3_STARTUP,

	WCD9XXX_IRQ_PA4_STARTUP,

	WCD9306_IRQ_HPH_PA_OCPR_FAULT = WCD9XXX_IRQ_PA4_STARTUP,

	WCD9XXX_IRQ_PA5_STARTUP,

	WCD9XXX_IRQ_MICBIAS1_PRECHARGE,

	WCD9306_IRQ_HPH_PA_OCPL_FAULT = WCD9XXX_IRQ_MICBIAS1_PRECHARGE,

	WCD9XXX_IRQ_MICBIAS2_PRECHARGE,

	WCD9XXX_IRQ_MICBIAS3_PRECHARGE,

	/* INTR_REG 2 */