Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6999181eecb11863b78030c68037a9f851522735

Authored by Linus Walleij
Committed by Samuel Ortiz
1 parent 33a0d1907f
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

mfd: ab8500: Pass AB8500 IRQ to debugfs code by resource 

The AB8500 debug code which was merged in parallell with the
multiplatform work incidentally introduced a new instance using
the <mach/irqs.h> header which is now deleted, causing this
build regression:

drivers/mfd/ab8500-debugfs.c:95:23:
fatal error: mach/irqs.h: No such file or directory
compilation terminated.
make[4]: *** [drivers/mfd/ab8500-debugfs.o] Error 1

The code most certainly never worked with device tree either
since that does not rely on this kind of hard-coded interrupt
numbers.

Fix the problem at the root by passing it as a named resource
from the ab8500-core driver. Use an untyped resource to
stop the MFD core from remapping this IRQ relative to the
AB8500 irqdomain.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

Showing 2 changed files with 27 additions and 4 deletions Side-by-side Diff

drivers/mfd/ab8500-core.c
Diff comments   View file @ 6999181
... ... @@ -868,6 +868,15 @@
868 868 #ifdef CONFIG_DEBUG_FS
869 869 static struct resource ab8500_debug_resources[] = {
870 870 {
  871 + .name = "IRQ_AB8500",
  872 + /*
  873 + * Number will be filled in. NOTE: this is deliberately
  874 + * not flagged as an IRQ in ordet to avoid remapping using
  875 + * the irqdomain in the MFD core, so that this IRQ passes
  876 + * unremapped to the debug code.
  877 + */
  878 + },
  879 + {
871 880 .name = "IRQ_FIRST",
872 881 .start = AB8500_INT_MAIN_EXT_CH_NOT_OK,
873 882 .end = AB8500_INT_MAIN_EXT_CH_NOT_OK,
... ... @@ -1711,6 +1720,12 @@
1711 1720 "ab8500", ab8500);
1712 1721 if (ret)
1713 1722 return ret;
  1723 +
  1724 +#if CONFIG_DEBUG_FS
  1725 + /* Pass to debugfs */
  1726 + ab8500_debug_resources[0].start = ab8500->irq;
  1727 + ab8500_debug_resources[0].end = ab8500->irq;
  1728 +#endif
1714 1729  
1715 1730 if (is_ab9540(ab8500))
1716 1731 ret = mfd_add_devices(ab8500->dev, 0, ab9540_devs,
drivers/mfd/ab8500-debugfs.c
Diff comments   View file @ 6999181
... ... @@ -91,12 +91,10 @@
91 91 #include <linux/ctype.h>
92 92 #endif
93 93  
94   -/* TODO: this file should not reference IRQ_DB8500_AB8500! */
95   -#include <mach/irqs.h>
96   -
97 94 static u32 debug_bank;
98 95 static u32 debug_address;
99 96  
  97 +static int irq_ab8500;
100 98 static int irq_first;
101 99 static int irq_last;
102 100 static u32 *irq_count;
... ... @@ -1589,7 +1587,7 @@
1589 1587 {
1590 1588 if (line < num_interrupt_lines) {
1591 1589 num_interrupts[line]++;
1592   - if (suspend_test_wake_cause_interrupt_is_mine(IRQ_DB8500_AB8500))
  1590 + if (suspend_test_wake_cause_interrupt_is_mine(irq_ab8500))
1593 1591 num_wake_interrupts[line]++;
1594 1592 }
1595 1593 }
... ... @@ -2941,6 +2939,7 @@
2941 2939 struct dentry *file;
2942 2940 int ret = -ENOMEM;
2943 2941 struct ab8500 *ab8500;
  2942 + struct resource *res;
2944 2943 debug_bank = AB8500_MISC;
2945 2944 debug_address = AB8500_REV_REG & 0x00FF;
2946 2945  
... ... @@ -2958,6 +2957,15 @@
2958 2957 event_name = kzalloc(sizeof(*event_name)*num_irqs, GFP_KERNEL);
2959 2958 if (!event_name)
2960 2959 goto out_freedev_attr;
  2960 +
  2961 + res = platform_get_resource_byname(plf, 0, "IRQ_AB8500");
  2962 + if (!res) {
  2963 + dev_err(&plf->dev, "AB8500 irq not found, err %d\n",
  2964 + irq_first);
  2965 + ret = -ENXIO;
  2966 + goto out_freeevent_name;
  2967 + }
  2968 + irq_ab8500 = res->start;
2961 2969  
2962 2970 irq_first = platform_get_irq_byname(plf, "IRQ_FIRST");
2963 2971 if (irq_first < 0) {