Merge "pinctrl: qcom: enable/disable mpm wakeup bit when using gpio as IRQ" (1e18bf1c) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/pinctrl/qcom/pinctrl-msm.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -894,6 +894,9 @@ static void msm_gpio_irq_enable(struct irq_data *d)
		irq_chip_enable_parent(d);
		}

		if (pctrl->mpm_wake_ctl)
		msm_gpio_mpm_wake_set(d->hwirq, true);

		if (test_bit(d->hwirq, pctrl->skip_wake_irqs))
		return;

		@@ -918,6 +921,9 @@ static void msm_gpio_irq_disable(struct irq_data *d)
		irq_chip_disable_parent(d);
		}

		if (pctrl->mpm_wake_ctl)
		msm_gpio_mpm_wake_set(d->hwirq, false);

		if (test_bit(d->hwirq, pctrl->skip_wake_irqs))
		return;

		@@ -1194,9 +1200,6 @@ static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
		struct msm_pinctrl *pctrl = gpiochip_get_data(gc);
		unsigned long flags;

		if (pctrl->mpm_wake_ctl)
		msm_gpio_mpm_wake_set(d->hwirq, on);

		if (d->parent_data)
		irq_chip_set_wake_parent(d, on);