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

Commit cf8e2e92 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: gpio: separate the interrupt header"

parents 73d6bc43 1287cdd7

arch/arm/mach-msm/board-dt.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
 * GNU General Public License for more details.

 */



#include <linux/gpio.h>

#include <linux/kernel.h>

#include <linux/of.h>

#include <linux/of_irq.h>
@@ -18,6 +17,7 @@ 
#include <linux/mfd/wcd9xxx/core.h>

#include <linux/irqchip.h>

#include <linux/irqchip/qpnp-int.h>

#include <linux/irqchip/msm-gpio-irq.h>

#include <asm/mach/map.h>

#include <asm/hardware/cache-l2x0.h>

#include <mach/mpm.h>

arch/arm/mach-msm/include/mach/gpio.h

+0 −12
Original line number Diff line number Diff line
@@ -228,16 +228,4 @@ static inline int msm_gpio_install_direct_irq(unsigned gpio, unsigned irq, 
}

#endif



#ifdef CONFIG_OF

#ifndef CONFIG_USE_PINCTRL_IRQ

int __init msm_gpio_of_init(struct device_node *node,

					struct device_node *parent);

extern struct irq_chip msm_gpio_irq_extn;

#else

int __init msm_tlmm_v3_of_irq_init(struct device_node *node,

					struct device_node *parent);

extern struct irq_chip mpm_tlmm_irq_extn;

#endif

#endif



#endif /* __ASM_ARCH_MSM_GPIO_H */

arch/arm/mach-msm/mpm-of.c

+1 −1
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ 
#include <linux/workqueue.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/clk/msm-clk.h>

#include <linux/irqchip/msm-gpio-irq.h>

#include <asm/arch_timer.h>

#include <mach/gpio.h>

#include <mach/mpm.h>



enum {

include/linux/irqchip/msm-gpio-irq.h

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

 *

 * 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef MSM_GPIO_IRQ_H

#define MSM_GPIO_IRQ_H



#include <linux/irq.h>



#if defined(CONFIG_GPIO_MSM_V1) || defined(CONFIG_GPIO_MSM_V2) \

		|| defined(CONFIG_GPIO_MSM_V3)

#ifndef CONFIG_USE_PINCTRL_IRQ

int __init msm_gpio_of_init(struct device_node *node,

					struct device_node *parent);

extern struct irq_chip msm_gpio_irq_extn;

#else

int __init msm_tlmm_v3_of_irq_init(struct device_node *node,

					struct device_node *parent);

extern struct irq_chip mpm_tlmm_irq_extn;

#endif

#else

static inline int __init msm_gpio_of_init(struct device_node *node,

					struct device_node *parent)

{

	return 0;

}

static inline int __init msm_tlmm_v3_of_irq_init(struct device_node *node,

					struct device_node *parent)

{

	return 0;

}

#endif

#endif /* MSM_GPIO_IRQ_H */