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

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

Merge "irqchip: qcom: pdc: Add irq_set_wake support to pdc irqchip"

parents f9eabdbb 5247142a

drivers/irqchip/qcom/mpm.c

+3 −2
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2010-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2010-2020, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -256,8 +256,9 @@ static struct irq_chip msm_mpm_gic_chip = { 
	.irq_disable	= msm_mpm_gic_chip_mask,

	.irq_disable	= msm_mpm_gic_chip_mask,

	.irq_unmask	= msm_mpm_gic_chip_unmask,

	.irq_unmask	= msm_mpm_gic_chip_unmask,

	.irq_retrigger	= irq_chip_retrigger_hierarchy,

	.irq_retrigger	= irq_chip_retrigger_hierarchy,

	.irq_set_wake	= irq_chip_set_wake_parent,

	.irq_set_type	= msm_mpm_gic_chip_set_type,

	.irq_set_type	= msm_mpm_gic_chip_set_type,

	.flags		= IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE,

	.flags		= IRQCHIP_MASK_ON_SUSPEND,

	.irq_set_affinity	= irq_chip_set_affinity_parent,

	.irq_set_affinity	= irq_chip_set_affinity_parent,

};

};

drivers/irqchip/qcom/pdc.c

+3 −3
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -239,11 +239,11 @@ static struct irq_chip qcom_pdc_gic_chip = { 
	.irq_enable		= qcom_pdc_gic_enable,

	.irq_enable		= qcom_pdc_gic_enable,

	.irq_unmask		= qcom_pdc_gic_unmask,

	.irq_unmask		= qcom_pdc_gic_unmask,

	.irq_disable		= qcom_pdc_gic_disable,

	.irq_disable		= qcom_pdc_gic_disable,

	.irq_set_wake		= irq_chip_set_wake_parent,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_set_type		= qcom_pdc_gic_set_type,

	.irq_set_type		= qcom_pdc_gic_set_type,

	.flags			= IRQCHIP_MASK_ON_SUSPEND |

	.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_vcpu_affinity	= irq_chip_set_vcpu_affinity_parent,

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	.irq_set_affinity	= irq_chip_set_affinity_parent,

	.irq_set_affinity	= irq_chip_set_affinity_parent,