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

Commit 0554d683 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "irqchip: qcom-pdc: Remove irq_disable callback""

parents 4bd3d726 cd0dd945

drivers/irqchip/qcom-pdc.c

+7 −18
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ struct pdc_pin_region { 
	u32 cnt;

};



DECLARE_BITMAP(pdc_wake_irqs, PDC_MAX_IRQS);

static DEFINE_RAW_SPINLOCK(pdc_lock);

static void __iomem *pdc_base, *pdc_cfg_base;

static struct pdc_pin_region *pdc_region;
@@ -74,20 +73,13 @@ static void pdc_enable_intr(struct irq_data *d, bool on) 
	raw_spin_unlock(&pdc_lock);

}



static int qcom_pdc_gic_set_wake(struct irq_data *d, unsigned int on)

static void qcom_pdc_gic_disable(struct irq_data *d)

{

	if (d->hwirq == GPIO_NO_WAKE_IRQ)

		return 0;



	if (on) {

		pdc_enable_intr(d, true);

		set_bit(d->hwirq, pdc_wake_irqs);

		irq_chip_enable_parent(d);

	} else {

		clear_bit(d->hwirq, pdc_wake_irqs);

	}

		return;



	return irq_chip_set_wake_parent(d, on);

	pdc_enable_intr(d, false);

	irq_chip_disable_parent(d);

}



static int qcom_pdc_gic_get_irqchip_state(struct irq_data *d,
@@ -124,10 +116,6 @@ static void qcom_pdc_gic_mask(struct irq_data *d) 


	ipc_log_string(pdc_ipc_log, "PIN=%d mask", d->hwirq);

	irq_chip_mask_parent(d);



	/* Mask at PDC if not a wake irq */

	if (!test_bit(d->hwirq, pdc_wake_irqs))

		pdc_enable_intr(d, false);

}



static void qcom_pdc_gic_unmask(struct irq_data *d)
@@ -253,14 +241,15 @@ static struct irq_chip qcom_pdc_gic_chip = { 
	.irq_eoi		= irq_chip_eoi_parent,

	.irq_mask		= qcom_pdc_gic_mask,

	.irq_unmask		= qcom_pdc_gic_unmask,

	.irq_disable		= qcom_pdc_gic_disable,

	.irq_enable		= qcom_pdc_gic_enable,

	.irq_get_irqchip_state	= qcom_pdc_gic_get_irqchip_state,

	.irq_set_irqchip_state	= qcom_pdc_gic_set_irqchip_state,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_set_type		= qcom_pdc_gic_set_type,

	.irq_set_wake		= qcom_pdc_gic_set_wake,

	.flags			= IRQCHIP_MASK_ON_SUSPEND |

				  IRQCHIP_SET_TYPE_MASKED,

				  IRQCHIP_SET_TYPE_MASKED |

				  IRQCHIP_SKIP_SET_WAKE,

	.irq_set_vcpu_affinity	= irq_chip_set_vcpu_affinity_parent,

	.irq_set_affinity	= irq_chip_set_affinity_parent,

};