afd4bf08bc
Manually merged:
layerscape/808-i2c-0011-i2c-imx-support-slave-mode-for-imx-I2C-driver.patch
layerscape/808-i2c-0012-i2c-imx-correct-code-of-errata-A-010650-for-layersca.patch
Remaining modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711, x86/64 [*],
ramips/mt7621 [*], ath79/tiny [*], ipq40xx [*], octeon [*],
realtek [*]
Run-tested: ipq806x/R7800, ramips/mt7621 [*], octeon [*], realtek [*]
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Tested-by: Stijn Segers <foss@volatilesystems.org> [*]
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 0d7b6f59e736f6f7389e5346a518f2dc009bbf89 Mon Sep 17 00:00:00 2001
|
|
From: gaopan <b54642@freescale.com>
|
|
Date: Tue, 12 May 2015 18:25:29 +0800
|
|
Subject: [PATCH] MLK-10893: i2c: imx: add irqf_no_suspend
|
|
|
|
The i2c irq is masked when pcie starts a i2c transfer process
|
|
during noirq suspend stage. As a result, i2c transfer fails.
|
|
To solve the problem, IRQF_NO_SUSPEND is added to i2c bus.
|
|
|
|
Signed-off-by: Gao Pan <b54642@freescale.com>
|
|
Signed-off-by: Fugang Duan <B38611@freescale.com>
|
|
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
|
|
(cherry picked from commit d21259d913effcad322e30d389323e72a0f9709d)
|
|
---
|
|
drivers/i2c/busses/i2c-imx.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/i2c/busses/i2c-imx.c
|
|
+++ b/drivers/i2c/busses/i2c-imx.c
|
|
@@ -1159,7 +1159,8 @@ static int i2c_imx_probe(struct platform
|
|
goto rpm_disable;
|
|
|
|
/* Request IRQ */
|
|
- ret = request_threaded_irq(irq, i2c_imx_isr, NULL, IRQF_SHARED,
|
|
+ ret = request_threaded_irq(irq, i2c_imx_isr, NULL,
|
|
+ IRQF_SHARED | IRQF_NO_SUSPEND,
|
|
pdev->name, i2c_imx);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "can't claim irq %d\n", irq);
|