mfd: Continue with IRQ setup even if we don't have PMIC main IRQ (bc86fcee) · Commits · 戴 / test

The fact that we can't actually raise any interrupts doesn't stop us setting up the IRQs we're exporting. While this isn't actually going to do anything it allows us to proceed further through device setup during board bringup and avoids issues with the MFD core not letting us suppress the configuration of IRQ resources. Signed-off-by:

Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by:

Samuel Ortiz <sameo@linux.intel.com>

drivers/mfd/wm831x-irq.c

+14 −13

Original line number	Diff line number	Diff line
		@@ -515,12 +515,6 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
		0xffff);
		}

		if (!irq) {
		dev_warn(wm831x->dev,
		"No interrupt specified - functionality limited\n");
		return 0;
		}

		if (!pdata \|\| !pdata->irq_base) {
		dev_err(wm831x->dev,
		"No interrupt base specified, no interrupts\n");
		@@ -567,6 +561,7 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
		#endif
		}

		if (irq) {
		ret = request_threaded_irq(irq, NULL, wm831x_irq_thread,
		IRQF_TRIGGER_LOW \| IRQF_ONESHOT,
		"wm831x", wm831x);
		@@ -575,6 +570,12 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
		irq, ret);
		return ret;
		}
		} else {
		dev_warn(wm831x->dev,
		"No interrupt specified - functionality limited\n");
		}



		/* Enable top level interrupts, we mask at secondary level */
		wm831x_reg_write(wm831x, WM831X_SYSTEM_INTERRUPTS_MASK, 0);

Admin message