blob: a98878a10fe8285910f6f121c0ccb9214100ba7f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From: Otavio Salvador <otavio@ossystems.com.br>
Subject: [PATCH 1/2] [MX23] Don't mangle IRQ_VDDA_BRNOUT for MX23 arch
This has been introduced on commit e93820b3 and makes the kernel to
fail to build for MX23 arch so we avoid the IRQ_VDDA_BRNOUT
manipulation for MX23 arch as this IRQ is not available on MX23.
Upstream-Status: Pending
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
drivers/power/mxs/linux.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/power/mxs/linux.c b/drivers/power/mxs/linux.c
index d5185fa..0d6c729 100644
--- a/drivers/power/mxs/linux.c
+++ b/drivers/power/mxs/linux.c
@@ -1171,7 +1171,9 @@ static int __init mxs_bat_init(void)
disable_irq(IRQ_DCDC4P2_BRNOUT);
disable_irq(IRQ_BATT_BRNOUT);
disable_irq(IRQ_VDDD_BRNOUT);
+#ifndef CONFIG_ARCH_MX23
disable_irq(IRQ_VDDA_BRNOUT);
+#endif
if (no_battery)
disable_irq(IRQ_VDDIO_BRNOUT);
#ifndef CONFIG_ARCH_MX28
@@ -1184,7 +1186,9 @@ static int __init mxs_bat_init(void)
mxs_set_irq_fiq(IRQ_DCDC4P2_BRNOUT, 1);
mxs_set_irq_fiq(IRQ_BATT_BRNOUT, 1);
mxs_set_irq_fiq(IRQ_VDDD_BRNOUT, 1);
+#ifndef CONFIG_ARCH_MX23
mxs_set_irq_fiq(IRQ_VDDA_BRNOUT, 1);
+#endif
if (no_battery)
mxs_set_irq_fiq(IRQ_VDDIO_BRNOUT, 1);
#ifndef CONFIG_ARCH_MX28
@@ -1199,7 +1203,9 @@ static int __init mxs_bat_init(void)
enable_irq(IRQ_DCDC4P2_BRNOUT);
enable_irq(IRQ_BATT_BRNOUT);
enable_irq(IRQ_VDDD_BRNOUT);
+#ifndef CONFIG_ARCH_MX23
enable_irq(IRQ_VDDA_BRNOUT);
+#endif
if (no_battery)
enable_irq(IRQ_VDDIO_BRNOUT);
#ifndef CONFIG_ARCH_MX28
--
1.7.10.4
|
