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>
Šī revīzija ir iekļauta:

revīziju iesūtīja
Samuel Ortiz

vecāks
33a0d1907f
revīzija
6999181eec
@@ -867,6 +867,15 @@ static struct resource ab8500_chargalg_resources[] = {};
|
||||
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
static struct resource ab8500_debug_resources[] = {
|
||||
{
|
||||
.name = "IRQ_AB8500",
|
||||
/*
|
||||
* Number will be filled in. NOTE: this is deliberately
|
||||
* not flagged as an IRQ in ordet to avoid remapping using
|
||||
* the irqdomain in the MFD core, so that this IRQ passes
|
||||
* unremapped to the debug code.
|
||||
*/
|
||||
},
|
||||
{
|
||||
.name = "IRQ_FIRST",
|
||||
.start = AB8500_INT_MAIN_EXT_CH_NOT_OK,
|
||||
@@ -1712,6 +1721,12 @@ static int ab8500_probe(struct platform_device *pdev)
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
#if CONFIG_DEBUG_FS
|
||||
/* Pass to debugfs */
|
||||
ab8500_debug_resources[0].start = ab8500->irq;
|
||||
ab8500_debug_resources[0].end = ab8500->irq;
|
||||
#endif
|
||||
|
||||
if (is_ab9540(ab8500))
|
||||
ret = mfd_add_devices(ab8500->dev, 0, ab9540_devs,
|
||||
ARRAY_SIZE(ab9540_devs), NULL,
|
||||
|
Atsaukties uz šo jaunā problēmā
Block a user