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

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

Merge "arm: msm: switch to using irqchip_init"

parents 75c08a06 57abc3b8

arch/arm/mach-msm/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ config ARCH_MSM8974 
	select KRAIT_REGULATOR

	select USB_ARCH_HAS_XHCI

	select ENABLE_VMALLOC_SAVINGS

	select MSM_IRQ



config ARCH_APQ8084

	bool "APQ8084"
@@ -72,6 +73,7 @@ config ARCH_APQ8084 
	select ENABLE_VMALLOC_SAVINGS

	select MSM_ULTRASOUND_B

	select MSM_MULTIMEDIA_USE_ION

	select MSM_IRQ



config ARCH_MPQ8092

	bool "MPQ8092"
@@ -101,6 +103,7 @@ config ARCH_MPQ8092 
	select PINCTRL_MSM_TLMM_V3

	select MSM_MULTIMEDIA_USE_ION

	select USB_ARCH_HAS_XHCI

	select MSM_IRQ



config ARCH_FSM9900

	bool "FSM9900"
@@ -122,6 +125,7 @@ config ARCH_FSM9900 
	select KRAIT_REGULATOR

	select ARCH_SUPPORTS_MSI

	select MIGHT_HAVE_PCI

	select MSM_IRQ



config ARCH_MSMKRYPTON

	bool "MSMKRYPTON"
@@ -145,6 +149,7 @@ config ARCH_MSMKRYPTON 
	select MSM_CORTEX_A7

	select PM_DEVFREQ

	select MSM_DEVFREQ_CPUBW

	select MSM_IRQ



config ARCH_MSM8610

	bool "MSM8610"
@@ -186,6 +191,7 @@ config ARCH_MSM8610 
	select PINCTRL

	select PINCTRL_MSM_TLMM_V3

	select MSM_MULTIMEDIA_USE_ION

	select MSM_IRQ



config ARCH_MSM8226

	bool "MSM8226"
@@ -228,6 +234,7 @@ config ARCH_MSM8226 
	select PINCTRL_MSM_TLMM_V3

	select ENABLE_VMALLOC_SAVINGS

	select MSM_MULTIMEDIA_USE_ION

	select MSM_IRQ



config ARCH_MSMSAMARIUM

	bool "MSMSAMARIUM"
@@ -258,6 +265,7 @@ config ARCH_MSMSAMARIUM 
	select PINCTRL

	select PINCTRL_MSM_TLMM_V3

	select MSM_MULTIMEDIA_USE_ION

	select MSM_IRQ

endmenu



config MSM_KRAIT_TBB_ABORT_HANDLER

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

+8 −9
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 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
@@ -121,7 +121,6 @@ static const char *apq8084_dt_match[] __initconst = { 


DT_MACHINE_START(APQ8084_DT, "Qualcomm APQ 8084 (Flattened Device Tree)")

	.map_io			= apq8084_map_io,

	.init_irq = msm_dt_init_irq,

	.init_machine		= apq8084_init,

	.dt_compat		= apq8084_dt_match,

	.reserve		= apq8084_reserve,

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

+8 −9
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, 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
@@ -115,7 +115,6 @@ static const char *mpq8092_dt_match[] __initconst = { 


DT_MACHINE_START(MSM8092_DT, "Qualcomm MSM 8092 (Flattened Device Tree)")

	.map_io			= mpq8092_map_io,

	.init_irq = msm_dt_init_irq_nompm,

	.init_machine		= mpq8092_init,

	.dt_compat		= mpq8092_dt_match,

	.reserve		= mpq8092_dt_reserve,

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

+8 −9
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, 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
@@ -128,7 +128,6 @@ static const char *msm8226_dt_match[] __initconst = { 


DT_MACHINE_START(MSM8226_DT, "Qualcomm MSM 8226 (Flattened Device Tree)")

	.map_io			= msm_map_msm8226_io,

	.init_irq = msm_dt_init_irq,

	.init_machine		= msm8226_init,

	.dt_compat		= msm8226_dt_match,

	.reserve		= msm8226_reserve,

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

+8 −9
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, 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
@@ -114,7 +114,6 @@ static const char *msm8610_dt_match[] __initconst = { 


DT_MACHINE_START(MSM8610_DT, "Qualcomm MSM 8610 (Flattened Device Tree)")

	.map_io			= msm_map_msm8610_io,

	.init_irq = msm_dt_init_irq,

	.init_machine		= msm8610_init,

	.dt_compat		= msm8610_dt_match,

	.restart		= msm_restart,