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

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

Merge "irqchip: msm_show_resume_irq: enable show resume irq"

parents 71b4ab21 c358e70e

arch/arm/mach-msm/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -1140,16 +1140,6 @@ config MSM_GSBI9_UART 
	help

	  This enables GSBI9 configured into UART.



config MSM_SHOW_RESUME_IRQ

	bool "Enable logging of interrupts that could have caused resume"

	depends on (ARM_GIC || PMIC8058)

	default y if PMIC8058

	default n

	help

		This option logs wake up interrupts that have triggered just before

		the resume loop unrolls. Say Y if you want to debug why the system

		resumed.



config MSM_ULTRASOUND_B

	bool "QDSP6V2 HW Ultrasound support"

	help

arch/arm/mach-msm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ obj-$(CONFIG_ARCH_APQ8084) += gpiomux-v2.o gpiomux.o 
obj-$(CONFIG_ARCH_FSM9900) += gpiomux-v2.o gpiomux.o



obj-$(CONFIG_MSM_RUN_QUEUE_STATS) += msm_rq_stats.o

obj-$(CONFIG_MSM_SHOW_RESUME_IRQ) += msm_show_resume_irq.o

obj-$(CONFIG_MSM_NATIVE_RESTART) += restart.o



obj-$(CONFIG_MSM_CACHE_ERP) += cache_erp.o

drivers/irqchip/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -30,6 +30,16 @@ config ARM_VIC_NR 
	  The maximum number of VICs available in the system, for

	  power management.



config MSM_SHOW_RESUME_IRQ

	bool "Enable logging of interrupts that could have caused resume"

	depends on ARM_GIC

	default n

	help

	  This option logs wake up interrupts that have triggered just before

	  the resume loop unrolls. It helps to debug to know any unnecessary

	  wake up interrupts that causes system to come out of low power modes.

	  Say Y if you want to debug why the system resumed.



config RENESAS_INTC_IRQPIN

	bool

	select IRQ_DOMAIN

drivers/irqchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,3 +17,4 @@ obj-$(CONFIG_RENESAS_IRQC) += irq-renesas-irqc.o 
obj-$(CONFIG_VERSATILE_FPGA_IRQ)	+= irq-versatile-fpga.o

obj-$(CONFIG_ARCH_VT8500)		+= irq-vt8500.o

obj-$(CONFIG_MSM_IRQ)			+= irq-msm.o

obj-$(CONFIG_MSM_SHOW_RESUME_IRQ)       += msm_show_resume_irq.o

arch/arm/mach-msm/msm_show_resume_irq.c→drivers/irqchip/msm_show_resume_irq.c

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

/* Copyright (c) 2011, 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