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

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

Merge "irqchip: mpm: Add mpm mapping for Blair"

parents fbb7d8a4 cea7789b

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 qcom-mpm-sdxnightjar.o qcom-mpm-monaco.o qcom-mpm-qcs405.o

mpm-objs +=       qcom-mpm.o qcom-mpm-holi.o qcom-mpm-sdxnightjar.o qcom-mpm-monaco.o qcom-mpm-qcs405.o qcom-mpm-blair.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-blair.c

0 → 100644
+17 −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_blair_gic_chip_data[] = {

	{5, 296}, /* lpass_irq_out_sdc */

	{12, 422}, /* qmp_usb3_lfps_rxterm_irq_cx */

	{86, 183}, /* mpm_wake,spmi_m */

	{89, 314}, /* tsens0_tsens_0C_int */

	{90, 315}, /* tsens1_tsens_0C_int */

	{93, 164}, /* eud_p0_dmse_int_mx */

	{94, 165}, /* eud_p0_dpse_int_mx */

	{-1},

};

drivers/irqchip/qcom-mpm.c

+4 −0
Original line number Diff line number Diff line
@@ -572,6 +572,10 @@ static const struct of_device_id mpm_gic_chip_data_table[] = { 
		.compatible = "qcom,mpm-gic-qcs405",

		.data = mpm_qcs405_gic_chip_data,

	},

	{

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

		.data = mpm_blair_gic_chip_data,

	},

	{}

};

MODULE_DEVICE_TABLE(of, mpm_gic_chip_data_table);

include/soc/qcom/mpm.h

+1 −0
Original line number Diff line number Diff line
@@ -20,4 +20,5 @@ extern const struct mpm_pin mpm_holi_gic_chip_data[]; 
extern const struct mpm_pin mpm_sdxnightjar_gic_chip_data[];

extern const struct mpm_pin mpm_monaco_gic_chip_data[];

extern const struct mpm_pin mpm_qcs405_gic_chip_data[];

extern const struct mpm_pin mpm_blair_gic_chip_data[];

#endif /* __QCOM_MPM_H__ */