Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[karo-tx-linux.git] / drivers / mfd / sec-irq.c

diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
index c901fa50fea19f0085dab4147fdf713fdc77d56f..0dd84e99081e9d30539ab96cccc255591a18be82 100644 (file)
--- a/drivers/mfd/sec-irq.c
+++ b/drivers/mfd/sec-irq.c
@@ -24,67 +24,67 @@
 
 static struct regmap_irq s2mps11_irqs[] = {
        [S2MPS11_IRQ_PWRONF] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S2MPS11_IRQ_PWRONF_MASK,
        },
        [S2MPS11_IRQ_PWRONR] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S2MPS11_IRQ_PWRONR_MASK,
        },
        [S2MPS11_IRQ_JIGONBF] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S2MPS11_IRQ_JIGONBF_MASK,
        },
        [S2MPS11_IRQ_JIGONBR] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S2MPS11_IRQ_JIGONBR_MASK,
        },
        [S2MPS11_IRQ_ACOKBF] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S2MPS11_IRQ_ACOKBF_MASK,
        },
        [S2MPS11_IRQ_ACOKBR] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S2MPS11_IRQ_ACOKBR_MASK,
        },
        [S2MPS11_IRQ_PWRON1S] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S2MPS11_IRQ_PWRON1S_MASK,
        },
        [S2MPS11_IRQ_MRB] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S2MPS11_IRQ_MRB_MASK,
        },
        [S2MPS11_IRQ_RTC60S] = {
-               .reg_offset = 2,
+               .reg_offset = 1,
                .mask = S2MPS11_IRQ_RTC60S_MASK,
        },
        [S2MPS11_IRQ_RTCA1] = {
-               .reg_offset = 2,
+               .reg_offset = 1,
                .mask = S2MPS11_IRQ_RTCA1_MASK,
        },
        [S2MPS11_IRQ_RTCA2] = {
-               .reg_offset = 2,
+               .reg_offset = 1,
                .mask = S2MPS11_IRQ_RTCA2_MASK,
        },
        [S2MPS11_IRQ_SMPL] = {
-               .reg_offset = 2,
+               .reg_offset = 1,
                .mask = S2MPS11_IRQ_SMPL_MASK,
        },
        [S2MPS11_IRQ_RTC1S] = {
-               .reg_offset = 2,
+               .reg_offset = 1,
                .mask = S2MPS11_IRQ_RTC1S_MASK,
        },
        [S2MPS11_IRQ_WTSR] = {
-               .reg_offset = 2,
+               .reg_offset = 1,
                .mask = S2MPS11_IRQ_WTSR_MASK,
        },
        [S2MPS11_IRQ_INT120C] = {
-               .reg_offset = 3,
+               .reg_offset = 2,
                .mask = S2MPS11_IRQ_INT120C_MASK,
        },
        [S2MPS11_IRQ_INT140C] = {
-               .reg_offset = 3,
+               .reg_offset = 2,
                .mask = S2MPS11_IRQ_INT140C_MASK,
        },
 };
@@ -92,146 +92,146 @@ static struct regmap_irq s2mps11_irqs[] = {
 
 static struct regmap_irq s5m8767_irqs[] = {
        [S5M8767_IRQ_PWRR] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S5M8767_IRQ_PWRR_MASK,
        },
        [S5M8767_IRQ_PWRF] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S5M8767_IRQ_PWRF_MASK,
        },
        [S5M8767_IRQ_PWR1S] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S5M8767_IRQ_PWR1S_MASK,
        },
        [S5M8767_IRQ_JIGR] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S5M8767_IRQ_JIGR_MASK,
        },
        [S5M8767_IRQ_JIGF] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S5M8767_IRQ_JIGF_MASK,
        },
        [S5M8767_IRQ_LOWBAT2] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S5M8767_IRQ_LOWBAT2_MASK,
        },
        [S5M8767_IRQ_LOWBAT1] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S5M8767_IRQ_LOWBAT1_MASK,
        },
        [S5M8767_IRQ_MRB] = {
-               .reg_offset = 2,
+               .reg_offset = 1,
                .mask = S5M8767_IRQ_MRB_MASK,
        },
        [S5M8767_IRQ_DVSOK2] = {
-               .reg_offset = 2,
+               .reg_offset = 1,
                .mask = S5M8767_IRQ_DVSOK2_MASK,
        },
        [S5M8767_IRQ_DVSOK3] = {
-               .reg_offset = 2,
+               .reg_offset = 1,
                .mask = S5M8767_IRQ_DVSOK3_MASK,
        },
        [S5M8767_IRQ_DVSOK4] = {
-               .reg_offset = 2,
+               .reg_offset = 1,
                .mask = S5M8767_IRQ_DVSOK4_MASK,
        },
        [S5M8767_IRQ_RTC60S] = {
-               .reg_offset = 3,
+               .reg_offset = 2,
                .mask = S5M8767_IRQ_RTC60S_MASK,
        },
        [S5M8767_IRQ_RTCA1] = {
-               .reg_offset = 3,
+               .reg_offset = 2,
                .mask = S5M8767_IRQ_RTCA1_MASK,
        },
        [S5M8767_IRQ_RTCA2] = {
-               .reg_offset = 3,
+               .reg_offset = 2,
                .mask = S5M8767_IRQ_RTCA2_MASK,
        },
        [S5M8767_IRQ_SMPL] = {
-               .reg_offset = 3,
+               .reg_offset = 2,
                .mask = S5M8767_IRQ_SMPL_MASK,
        },
        [S5M8767_IRQ_RTC1S] = {
-               .reg_offset = 3,
+               .reg_offset = 2,
                .mask = S5M8767_IRQ_RTC1S_MASK,
        },
        [S5M8767_IRQ_WTSR] = {
-               .reg_offset = 3,
+               .reg_offset = 2,
                .mask = S5M8767_IRQ_WTSR_MASK,
        },
 };
 
 static struct regmap_irq s5m8763_irqs[] = {
        [S5M8763_IRQ_DCINF] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S5M8763_IRQ_DCINF_MASK,
        },
        [S5M8763_IRQ_DCINR] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S5M8763_IRQ_DCINR_MASK,
        },
        [S5M8763_IRQ_JIGF] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S5M8763_IRQ_JIGF_MASK,
        },
        [S5M8763_IRQ_JIGR] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S5M8763_IRQ_JIGR_MASK,
        },
        [S5M8763_IRQ_PWRONF] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S5M8763_IRQ_PWRONF_MASK,
        },
        [S5M8763_IRQ_PWRONR] = {
-               .reg_offset = 1,
+               .reg_offset = 0,
                .mask = S5M8763_IRQ_PWRONR_MASK,
        },
        [S5M8763_IRQ_WTSREVNT] = {
-               .reg_offset = 2,
+               .reg_offset = 1,
                .mask = S5M8763_IRQ_WTSREVNT_MASK,
        },
        [S5M8763_IRQ_SMPLEVNT] = {
-               .reg_offset = 2,
+               .reg_offset = 1,
                .mask = S5M8763_IRQ_SMPLEVNT_MASK,
        },
        [S5M8763_IRQ_ALARM1] = {
-               .reg_offset = 2,
+               .reg_offset = 1,
                .mask = S5M8763_IRQ_ALARM1_MASK,
        },
        [S5M8763_IRQ_ALARM0] = {
-               .reg_offset = 2,
+               .reg_offset = 1,
                .mask = S5M8763_IRQ_ALARM0_MASK,
        },
        [S5M8763_IRQ_ONKEY1S] = {
-               .reg_offset = 3,
+               .reg_offset = 2,
                .mask = S5M8763_IRQ_ONKEY1S_MASK,
        },
        [S5M8763_IRQ_TOPOFFR] = {
-               .reg_offset = 3,
+               .reg_offset = 2,
                .mask = S5M8763_IRQ_TOPOFFR_MASK,
        },
        [S5M8763_IRQ_DCINOVPR] = {
-               .reg_offset = 3,
+               .reg_offset = 2,
                .mask = S5M8763_IRQ_DCINOVPR_MASK,
        },
        [S5M8763_IRQ_CHGRSTF] = {
-               .reg_offset = 3,
+               .reg_offset = 2,
                .mask = S5M8763_IRQ_CHGRSTF_MASK,
        },
        [S5M8763_IRQ_DONER] = {
-               .reg_offset = 3,
+               .reg_offset = 2,
                .mask = S5M8763_IRQ_DONER_MASK,
        },
        [S5M8763_IRQ_CHGFAULT] = {
-               .reg_offset = 3,
+               .reg_offset = 2,
                .mask = S5M8763_IRQ_CHGFAULT_MASK,
        },
        [S5M8763_IRQ_LOBAT1] = {
-               .reg_offset = 4,
+               .reg_offset = 3,
                .mask = S5M8763_IRQ_LOBAT1_MASK,
        },
        [S5M8763_IRQ_LOBAT2] = {
-               .reg_offset = 4,
+               .reg_offset = 3,
                .mask = S5M8763_IRQ_LOBAT2_MASK,
        },
 };