From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] mfd: mc13xxx: Set the irq type.
Date: Wed, 4 Jan 2017 11:09:59 +0000 [thread overview]
Message-ID: <20170104110959.GZ27589@dell> (raw)
In-Reply-To: <1483112613-18092-1-git-send-email-lilja.magnus@gmail.com>
On Fri, 30 Dec 2016, Magnus Lilja wrote:
> Commit 10f9edaeaa30 ("mfd: mc13xxx: Use regmap irq framework for
> interrupts") removed the passing of the IRQF_TRIGGER_HIGH flag when
> registering the interrupt.
> This commit fixes that problem by setting the IRQF_TRIGGER_HIGH flag in
> case no irq type is set via irqd framework (e.g. device tree). In the
> latter case the irq flag from irqd is used.
This looks like a hack.
Why can't you set the trigger type in Device Tree instead?
> Tested on i.MX31 PDK hardware.
>
> Fixes: 10f9edaeaa30 ("mfd: mc13xxx: Use regmap irq framework for interrupts")
> Cc: <stable@vger.kernel.org> # 3.18.x
> Cc: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
> ---
> Changes from v1 (which was part of a patch series):
> - Now uses irqd_-functions to check if irq type is defined
> - Added Fixes: and Cc: to stable kernel.
>
> drivers/mfd/mc13xxx-core.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
> index d7f54e4..e1757ea 100644
> --- a/drivers/mfd/mc13xxx-core.c
> +++ b/drivers/mfd/mc13xxx-core.c
> @@ -15,6 +15,7 @@
> #include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/mfd/core.h>
> +#include <linux/irq.h>
>
> #include "mc13xxx.h"
>
> @@ -410,6 +411,7 @@ int mc13xxx_common_init(struct device *dev)
> struct mc13xxx *mc13xxx = dev_get_drvdata(dev);
> u32 revision;
> int i, ret;
> + unsigned int flags;
>
> mc13xxx->dev = dev;
>
> @@ -440,7 +442,11 @@ int mc13xxx_common_init(struct device *dev)
> mc13xxx->irq_chip.irqs = mc13xxx->irqs;
> mc13xxx->irq_chip.num_irqs = ARRAY_SIZE(mc13xxx->irqs);
>
> - ret = regmap_add_irq_chip(mc13xxx->regmap, mc13xxx->irq, IRQF_ONESHOT,
> + flags = irqd_get_trigger_type(irq_get_irq_data(mc13xxx->irq));
> + flags = (flags == IRQ_TYPE_NONE) ? IRQF_TRIGGER_HIGH : flags;
> +
> + ret = regmap_add_irq_chip(mc13xxx->regmap, mc13xxx->irq,
> + IRQF_ONESHOT | flags,
> 0, &mc13xxx->irq_chip, &mc13xxx->irq_data);
> if (ret)
> return ret;
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2017-01-04 11:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-30 15:43 [PATCH v2] mfd: mc13xxx: Set the irq type Magnus Lilja
2016-12-30 17:55 ` Fabio Estevam
2017-01-04 11:09 ` Lee Jones [this message]
2017-01-04 17:32 ` Magnus Lilja
2017-01-05 7:51 ` Lee Jones
2017-07-21 7:36 ` Magnus Lilja
2017-07-25 9:12 ` Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170104110959.GZ27589@dell \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).