Merge tag 'pinctrl-v4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[sfrench/cifs-2.6.git] / drivers / pinctrl / intel / pinctrl-intel.c

diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 71df0f70b61f01c51484c87f35bdba9a1158cdbc..12a1af45acb98557de6184e934360dc056fbc01a 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -30,8 +30,6 @@
 
 #define PADBAR                         0x00c
 #define GPI_IS                         0x100
-#define GPI_GPE_STS                    0x140
-#define GPI_GPE_EN                     0x160
 
 #define PADOWN_BITS                    4
 #define PADOWN_SHIFT(p)                        ((p) % 8 * PADOWN_BITS)
@@ -818,7 +816,7 @@ static void intel_gpio_irq_ack(struct irq_data *d)
        community = intel_get_community(pctrl, pin);
        if (community) {
                const struct intel_padgroup *padgrp;
-               unsigned gpp, gpp_offset;
+               unsigned gpp, gpp_offset, is_offset;
 
                padgrp = intel_community_get_padgroup(community, pin);
                if (!padgrp)
@@ -826,9 +824,10 @@ static void intel_gpio_irq_ack(struct irq_data *d)
 
                gpp = padgrp->reg_num;
                gpp_offset = padgroup_offset(padgrp, pin);
+               is_offset = community->is_offset + gpp * 4;
 
                raw_spin_lock(&pctrl->lock);
-               writel(BIT(gpp_offset), community->regs + GPI_IS + gpp * 4);
+               writel(BIT(gpp_offset), community->regs + is_offset);
                raw_spin_unlock(&pctrl->lock);
        }
 }
@@ -843,7 +842,7 @@ static void intel_gpio_irq_enable(struct irq_data *d)
        community = intel_get_community(pctrl, pin);
        if (community) {
                const struct intel_padgroup *padgrp;
-               unsigned gpp, gpp_offset;
+               unsigned gpp, gpp_offset, is_offset;
                unsigned long flags;
                u32 value;
 
@@ -853,10 +852,11 @@ static void intel_gpio_irq_enable(struct irq_data *d)
 
                gpp = padgrp->reg_num;
                gpp_offset = padgroup_offset(padgrp, pin);
+               is_offset = community->is_offset + gpp * 4;
 
                raw_spin_lock_irqsave(&pctrl->lock, flags);
                /* Clear interrupt status first to avoid unexpected interrupt */
-               writel(BIT(gpp_offset), community->regs + GPI_IS + gpp * 4);
+               writel(BIT(gpp_offset), community->regs + is_offset);
 
                value = readl(community->regs + community->ie_offset + gpp * 4);
                value |= BIT(gpp_offset);
@@ -991,7 +991,8 @@ static irqreturn_t intel_gpio_community_irq_handler(struct intel_pinctrl *pctrl,
                const struct intel_padgroup *padgrp = &community->gpps[gpp];
                unsigned long pending, enabled, gpp_offset;
 
-               pending = readl(community->regs + GPI_IS + padgrp->reg_num * 4);
+               pending = readl(community->regs + community->is_offset +
+                               padgrp->reg_num * 4);
                enabled = readl(community->regs + community->ie_offset +
                                padgrp->reg_num * 4);
 
@@ -1005,7 +1006,7 @@ static irqreturn_t intel_gpio_community_irq_handler(struct intel_pinctrl *pctrl,
                        if (padno >= community->npins)
                                break;
 
-                       irq = irq_find_mapping(gc->irqdomain,
+                       irq = irq_find_mapping(gc->irq.domain,
                                               community->pin_base + padno);
                        generic_handle_irq(irq);
 
@@ -1241,6 +1242,9 @@ int intel_pinctrl_probe(struct platform_device *pdev,
                community->regs = regs;
                community->pad_regs = regs + padbar;
 
+               if (!community->is_offset)
+                       community->is_offset = GPI_IS;
+
                ret = intel_pinctrl_add_padgroups(pctrl, community);
                if (ret)
                        return ret;
@@ -1356,7 +1360,7 @@ static void intel_gpio_irq_init(struct intel_pinctrl *pctrl)
                for (gpp = 0; gpp < community->ngpps; gpp++) {
                        /* Mask and clear all interrupts */
                        writel(0, base + community->ie_offset + gpp * 4);
-                       writel(0xffff, base + GPI_IS + gpp * 4);
+                       writel(0xffff, base + community->is_offset + gpp * 4);
                }
        }
 }