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

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

Merge "msm: mpm: move header to include/irqchip"

parents cf8e2e92 6063236c

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,9 +18,9 @@ 
#include <linux/irqchip.h>

#include <linux/irqchip.h>

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

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

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

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

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

#include <asm/mach/map.h>

#include <asm/mach/map.h>

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

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

#include <mach/mpm.h>

#include <mach/msm_iomap.h>

#include <mach/msm_iomap.h>

#include <mach/scm.h>

#include <mach/scm.h>

arch/arm/mach-msm/lpm_levels.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/mutex.h>

#include <linux/mutex.h>

#include <linux/cpu.h>

#include <linux/cpu.h>

#include <linux/of.h>

#include <linux/of.h>

#include <mach/mpm.h>

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

#include "pm.h"

#include "pm.h"

#include "rpm-notifier.h"

#include "rpm-notifier.h"

#include "spm.h"

#include "spm.h"

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

+13 −1
Original line number Original line Diff line number Diff line
@@ -36,8 +36,8 @@ 
#include <linux/irqchip/arm-gic.h>

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

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

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

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

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

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

#include <asm/arch_timer.h>

#include <asm/arch_timer.h>

#include <mach/mpm.h>





enum {

enum {

	MSM_MPM_GIC_IRQ_DOMAIN,

	MSM_MPM_GIC_IRQ_DOMAIN,
@@ -80,6 +80,18 @@ static unsigned int msm_mpm_irqs_m2a[MSM_MPM_NR_MPM_IRQS]; 
#define hashfn(val) (val % MSM_MPM_NR_MPM_IRQS)

#define hashfn(val) (val % MSM_MPM_NR_MPM_IRQS)

#define SCLK_HZ (32768)

#define SCLK_HZ (32768)

#define ARCH_TIMER_HZ (19200000)

#define ARCH_TIMER_HZ (19200000)



struct msm_mpm_device_data {

	uint16_t *irqs_m2a;

	unsigned int irqs_m2a_size;

	uint16_t *bypassed_apps_irqs;

	unsigned int bypassed_apps_irqs_size;

	void __iomem *mpm_request_reg_base;

	void __iomem *mpm_status_reg_base;

	void __iomem *mpm_apps_ipc_reg;

	unsigned int mpm_apps_ipc_val;

	unsigned int mpm_ipc_irq;

};

static struct msm_mpm_device_data msm_mpm_dev_data;

static struct msm_mpm_device_data msm_mpm_dev_data;





static struct clk *xo_clk;

static struct clk *xo_clk;

arch/arm/mach-msm/pm-8x60.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/regulator/krait-regulator.h>

#include <linux/regulator/krait-regulator.h>

#include <linux/cpu.h>

#include <linux/cpu.h>

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

#include <mach/avs.h>

#include <mach/avs.h>

#include <mach/socinfo.h>

#include <mach/socinfo.h>

#include <mach/scm.h>

#include <mach/scm.h>
@@ -42,7 +43,6 @@ 
#include <mach/trace_msm_low_power.h>

#include <mach/trace_msm_low_power.h>

#include <mach/msm-krait-l2-accessors.h>

#include <mach/msm-krait-l2-accessors.h>

#include <mach/msm_bus.h>

#include <mach/msm_bus.h>

#include <mach/mpm.h>

#include <mach/jtag.h>

#include <mach/jtag.h>

#include <asm/suspend.h>

#include <asm/suspend.h>

#include <asm/cacheflush.h>

#include <asm/cacheflush.h>

drivers/gpio/gpio-msm-common.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/init.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/irqchip/chained_irq.h>

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

#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/module.h>
@@ -29,7 +30,6 @@ 




#include <mach/msm_iomap.h>

#include <mach/msm_iomap.h>

#include <mach/gpiomux.h>

#include <mach/gpiomux.h>

#include <mach/mpm.h>

#include "gpio-msm-common.h"

#include "gpio-msm-common.h"





#ifdef CONFIG_GPIO_MSM_V3

#ifdef CONFIG_GPIO_MSM_V3