Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22c75fe7 authored by Mark Brown's avatar Mark Brown Committed by Samuel Ortiz
Browse files

mfd: arizona: Try to use interrupt flags from interrupt controller 



If no irq_flags are passed in platform data then query the interrupt
controller for the trigger type and try to use that. This provides
default operation with a wider range of hardware and will be needed
for device tree support where the interrupt flags are configured on
the interrupt controller.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 3092f805

drivers/mfd/arizona-irq.c

+25 −2
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ int arizona_irq_init(struct arizona *arizona) 
	int ret, i;

	const struct regmap_irq_chip *aod, *irq;

	bool ctrlif_error = true;

	struct irq_data *irq_data;



	switch (arizona->type) {

#ifdef CONFIG_MFD_WM5102
@@ -215,8 +216,30 @@ int arizona_irq_init(struct arizona *arizona) 
	/* Disable all wake sources by default */

	regmap_write(arizona->regmap, ARIZONA_WAKE_CONTROL, 0);



	if (!arizona->pdata.irq_flags)

	/* Read the flags from the interrupt controller if not specified */

	if (!arizona->pdata.irq_flags) {

		irq_data = irq_get_irq_data(arizona->irq);

		if (!irq_data) {

			dev_err(arizona->dev, "Invalid IRQ: %d\n",

				arizona->irq);

			return -EINVAL;

		}



		arizona->pdata.irq_flags = irqd_get_trigger_type(irq_data);

		switch (arizona->pdata.irq_flags) {

		case IRQF_TRIGGER_LOW:

		case IRQF_TRIGGER_HIGH:

		case IRQF_TRIGGER_RISING:

		case IRQF_TRIGGER_FALLING:

			break;



		case IRQ_TYPE_NONE:

		default:

			/* Device default */

			arizona->pdata.irq_flags = IRQF_TRIGGER_LOW;

			break;

		}

	}



	if (arizona->pdata.irq_flags & (IRQF_TRIGGER_HIGH |

					IRQF_TRIGGER_RISING)) {