Merge "ASoC: wcd: add IRQF_NO_SUSPEND flag" (c96b0bd7) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/codecs/msm8916-wcd-irq.c

+14 −4

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2015, 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
		@@ -30,7 +30,7 @@

		#define MAX_NUM_IRQS 14
		#define NUM_IRQ_REGS 2
		#define WCD9XXX_SYSTEM_RESUME_TIMEOUT_MS 300
		#define WCD9XXX_SYSTEM_RESUME_TIMEOUT_MS 700

		#define BYTE_BIT_MASK(nr) (1UL << ((nr) % BITS_PER_BYTE))
		#define BIT_BYTE(nr) ((nr) / BITS_PER_BYTE)
		@@ -158,14 +158,24 @@ int wcd9xxx_spmi_request_irq(int irq, irq_handler_t handler,
		const char name, void priv)
		{
		int rc;
		unsigned long irq_flags;

		map.linuxirq[irq] =
		spmi_get_irq_byname(map.spmi[BIT_BYTE(irq)], NULL,
		irq_names[irq]);

		if (strcmp(name, "mbhc sw intr"))
		irq_flags = IRQF_TRIGGER_RISING \| IRQF_TRIGGER_FALLING \|
		IRQF_ONESHOT;
		else
		irq_flags = IRQF_TRIGGER_RISING \| IRQF_TRIGGER_FALLING \|
		IRQF_ONESHOT \| IRQF_NO_SUSPEND;
		pr_debug("%s: name:%s irq_flags = %lx\n", __func__, name, irq_flags);

		rc = devm_request_threaded_irq(&map.spmi[BIT_BYTE(irq)]->dev,
		map.linuxirq[irq], NULL,
		wcd9xxx_spmi_irq_handler,
		IRQF_TRIGGER_RISING \| IRQF_TRIGGER_FALLING
		\| IRQF_ONESHOT,
		irq_flags,
		name, priv);
		if (rc < 0) {
		dev_err(&map.spmi[BIT_BYTE(irq)]->dev,