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

Commit 67762095 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Lee Jones
Browse files

mfd: sec-irq: Use consistent S2MPS11 RTC alarm interrupt indexes 



The S2MPS11 RTC has two alarms: alarm0 and alarm1 (corresponding
interrupts are named similarly). Use consistent names for interrupts to
limit possible errors.

Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 3e5a45f7

drivers/mfd/sec-irq.c

+4 −4
Original line number Diff line number Diff line
@@ -59,13 +59,13 @@ static const struct regmap_irq s2mps11_irqs[] = { 
		.reg_offset = 1,

		.mask = S2MPS11_IRQ_RTC60S_MASK,

	},

	[S2MPS11_IRQ_RTCA1] = {

	[S2MPS11_IRQ_RTCA0] = {

		.reg_offset = 1,

		.mask = S2MPS11_IRQ_RTCA1_MASK,

		.mask = S2MPS11_IRQ_RTCA0_MASK,

	},

	[S2MPS11_IRQ_RTCA2] = {

	[S2MPS11_IRQ_RTCA1] = {

		.reg_offset = 1,

		.mask = S2MPS11_IRQ_RTCA2_MASK,

		.mask = S2MPS11_IRQ_RTCA1_MASK,

	},

	[S2MPS11_IRQ_SMPL] = {

		.reg_offset = 1,

include/linux/mfd/samsung/irq.h

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ enum s2mps11_irq { 
	S2MPS11_IRQ_MRB,



	S2MPS11_IRQ_RTC60S,

	S2MPS11_IRQ_RTCA0,

	S2MPS11_IRQ_RTCA1,

	S2MPS11_IRQ_RTCA2,

	S2MPS11_IRQ_SMPL,

	S2MPS11_IRQ_RTC1S,

	S2MPS11_IRQ_WTSR,
@@ -47,7 +47,7 @@ enum s2mps11_irq { 


#define S2MPS11_IRQ_RTC60S_MASK		(1 << 0)

#define S2MPS11_IRQ_RTCA1_MASK		(1 << 1)

#define S2MPS11_IRQ_RTCA2_MASK		(1 << 2)

#define S2MPS11_IRQ_RTCA0_MASK		(1 << 2)

#define S2MPS11_IRQ_SMPL_MASK		(1 << 3)

#define S2MPS11_IRQ_RTC1S_MASK		(1 << 4)

#define S2MPS11_IRQ_WTSR_MASK		(1 << 5)