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

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

Merge "drivers: irqchip: qcom: Add MSM8937 pin data for MPM"

parents f221eabf c72dd3d0

drivers/irqchip/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -88,5 +88,5 @@ obj-$(CONFIG_MESON_IRQ_GPIO) += irq-meson-gpio.o 
obj-$(CONFIG_GOLDFISH_PIC) 		+= irq-goldfish-pic.o

obj-$(CONFIG_NDS32)			+= irq-ativic32.o

obj-$(CONFIG_QCOM_PDC)			+= qcom-pdc.o

obj-$(CONFIG_QCOM_MPM)			+= qcom-mpm.o qcom-mpm-bengal.o qcom-mpm-scuba.o qcom-mpm-sdm660.o

obj-$(CONFIG_QCOM_MPM)			+= qcom-mpm.o qcom-mpm-bengal.o qcom-mpm-scuba.o qcom-mpm-sdm660.o qcom-mpm-msm8937.o

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

drivers/irqchip/qcom-mpm-msm8937.c

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

	{2, 216},

	{49, 172},

	{53, 104},

	{58, 166},

	{62, 222},

	{-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>
@@ -596,6 +596,10 @@ static const struct of_device_id mpm_gic_chip_data_table[] = { 
		.compatible = "qcom,mpm-gic-sdm660",

		.data = mpm_sdm660_gic_chip_data,

	},

	{

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

		.data = mpm_msm8937_gic_chip_data,

	},

	{}

};

MODULE_DEVICE_TABLE(of, mpm_gic_chip_data_table);

include/soc/qcom/mpm.h

+3 −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,6 @@ struct mpm_pin { 
extern const struct mpm_pin mpm_bengal_gic_chip_data[];

extern const struct mpm_pin mpm_scuba_gic_chip_data[];

extern const struct mpm_pin mpm_sdm660_gic_chip_data[];

extern const struct mpm_pin mpm_msm8937_gic_chip_data[];



#endif /* __QCOM_MPM_H__ */