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

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

Merge "irqchip: mpm: Add mpm mapping for gic wakeup capable irqs"

parents f0f94e22 292ced49

drivers/irqchip/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ obj-$(CONFIG_QCOM_PDC) += qcom-pdc.o 
obj-$(CONFIG_CSKY_MPINTC)		+= irq-csky-mpintc.o

obj-$(CONFIG_CSKY_APB_INTC)		+= irq-csky-apb-intc.o

obj-$(CONFIG_QCOM_MPM)			+= mpm.o

mpm-objs +=       qcom-mpm.o qcom-mpm-holi.o

mpm-objs +=       qcom-mpm.o qcom-mpm-holi.o qcom-mpm-sdxnightjar.o

obj-$(CONFIG_SIFIVE_PLIC)		+= irq-sifive-plic.o

obj-$(CONFIG_IMX_IRQSTEER)		+= irq-imx-irqsteer.o

obj-$(CONFIG_MADERA_IRQ)		+= irq-madera.o

drivers/irqchip/qcom-mpm-sdxnightjar.c

0 → 100644
+13 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2021, The Linux Foundation. All rights reserved.

 */



#include <soc/qcom/mpm.h>

const struct mpm_pin mpm_sdxnightjar_gic_chip_data[] = {

	{2, 216}, /* tsens_upper_lower_int */

	{88, 222},   /* ee0_krait_hlos_spmi_periph_irq */

	{54, 235},   /* qmp_usb3_lfps_rxterm_irq */

	{49, 234},   /* qusb2_phy_dpse_hv qusb2phy_intr */

	{-1},

};

drivers/irqchip/qcom-mpm.c

+5 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

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

 */



#include <linux/delay.h>
@@ -560,6 +560,10 @@ static const struct of_device_id mpm_gic_chip_data_table[] = { 
		.compatible = "qcom,mpm-gic-holi",

		.data = mpm_holi_gic_chip_data,

	},

	{

		.compatible = "qcom,mpm-gic-sdxnightjar",

		.data = mpm_sdxnightjar_gic_chip_data,

	},

	{}

};

MODULE_DEVICE_TABLE(of, mpm_gic_chip_data_table);

include/soc/qcom/mpm.h

+2 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

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

 * Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.

 */



#ifndef __QCOM_MPM_H__
@@ -17,4 +17,5 @@ struct mpm_pin { 
void msm_mpm_timer_write(uint32_t *expiry);

void msm_mpm_enter_sleep(struct cpumask *cpumask);

extern const struct mpm_pin mpm_holi_gic_chip_data[];

extern const struct mpm_pin mpm_sdxnightjar_gic_chip_data[];

#endif /* __QCOM_MPM_H__ */