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

Commit 4cc629b7 authored by Stephen Boyd's avatar Stephen Boyd Committed by Linus Walleij
Browse files

gpio: msm: Fix irq mask/unmask by writing bits instead of numbers 



We should be writing bits here but instead we're writing the
numbers that correspond to the bits we want to write. Fix it by
wrapping the numbers in the BIT() macro. This fixes gpios acting
as interrupts.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f5837ec1

drivers/gpio/gpio-msm-v2.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -252,7 +252,7 @@ static void msm_gpio_irq_mask(struct irq_data *d) 




	spin_lock_irqsave(&tlmm_lock, irq_flags);

	spin_lock_irqsave(&tlmm_lock, irq_flags);

	writel(TARGET_PROC_NONE, GPIO_INTR_CFG_SU(gpio));

	writel(TARGET_PROC_NONE, GPIO_INTR_CFG_SU(gpio));

	clear_gpio_bits(INTR_RAW_STATUS_EN | INTR_ENABLE, GPIO_INTR_CFG(gpio));

	clear_gpio_bits(BIT(INTR_RAW_STATUS_EN) | BIT(INTR_ENABLE), GPIO_INTR_CFG(gpio));

	__clear_bit(gpio, msm_gpio.enabled_irqs);

	__clear_bit(gpio, msm_gpio.enabled_irqs);

	spin_unlock_irqrestore(&tlmm_lock, irq_flags);

	spin_unlock_irqrestore(&tlmm_lock, irq_flags);

}

}
@@ -264,7 +264,7 @@ static void msm_gpio_irq_unmask(struct irq_data *d) 




	spin_lock_irqsave(&tlmm_lock, irq_flags);

	spin_lock_irqsave(&tlmm_lock, irq_flags);

	__set_bit(gpio, msm_gpio.enabled_irqs);

	__set_bit(gpio, msm_gpio.enabled_irqs);

	set_gpio_bits(INTR_RAW_STATUS_EN | INTR_ENABLE, GPIO_INTR_CFG(gpio));

	set_gpio_bits(BIT(INTR_RAW_STATUS_EN) | BIT(INTR_ENABLE), GPIO_INTR_CFG(gpio));

	writel(TARGET_PROC_SCORPION, GPIO_INTR_CFG_SU(gpio));

	writel(TARGET_PROC_SCORPION, GPIO_INTR_CFG_SU(gpio));

	spin_unlock_irqrestore(&tlmm_lock, irq_flags);

	spin_unlock_irqrestore(&tlmm_lock, irq_flags);

}

}