Merge "drivers: pinctrl-msm: Move setting mpm_wake_ctl during .irq_enable" (4abc6114) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/pinctrl/qcom/pinctrl-msm.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -872,6 +872,11 @@ static void msm_gpio_irq_enable(struct irq_data *d)
		struct irq_data *dir_conn_data;
		irq_hw_number_t dir_conn_irq = 0;

		if (test_bit(d->hwirq, pctrl->skip_wake_irqs)) {
		if (pctrl->mpm_wake_ctl)
		msm_gpio_mpm_wake_set(d->hwirq, true);
		}

		/*
		* Clear the interrupt that may be pending before we enable
		* the line.
		@@ -895,11 +900,8 @@ static void msm_gpio_irq_enable(struct irq_data *d)
		irq_chip_enable_parent(d);
		}

		if (test_bit(d->hwirq, pctrl->skip_wake_irqs)) {
		if (pctrl->mpm_wake_ctl)
		msm_gpio_mpm_wake_set(d->hwirq, true);
		if (test_bit(d->hwirq, pctrl->skip_wake_irqs))
		return;
		}

		msm_gpio_irq_clear_unmask(d, true);
		}
		@@ -1341,6 +1343,8 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl)
		pctrl->irq_chip.irq_set_wake = msm_gpio_irq_set_wake;
		pctrl->irq_chip.irq_set_affinity = msm_gpio_irq_set_affinity;
		pctrl->irq_chip.irq_set_vcpu_affinity = msm_gpio_irq_set_vcpu_affinity;
		pctrl->irq_chip.flags = IRQCHIP_MASK_ON_SUSPEND
		\| IRQCHIP_SET_TYPE_MASKED;

		dn = of_parse_phandle(pctrl->dev->of_node, "wakeup-parent", 0);
		if (dn) {