From: Thomas Preston <thomas.preston@codethink.co.uk>
To: linus.walleij@linaro.org, robh+dt@kernel.org,
linux-gpio@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: thomas.preston@codethink.co.uk
Subject: [PATCH 2/3] pinctrl: mcp23s08: Remove interrupt-controller
Date: Fri, 14 Aug 2020 11:03:56 +0100 [thread overview]
Message-ID: <20200814100357.209340-3-thomas.preston@codethink.co.uk> (raw)
In-Reply-To: <20200814100357.209340-1-thomas.preston@codethink.co.uk>
The mcp23s08 device and friends are interrupt /client/ nodes, and should
not reference the interrupt controller device tree property
"interrupt-controller" [0].
Fix the mcp23s08 driver so that it activates interrupts when it detects
the "interrupts" property instead, which is always present if we want
interrupts enabled.
[0] Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
Signed-off-by: Thomas Preston <thomas.preston@codethink.co.uk>
---
drivers/pinctrl/pinctrl-mcp23s08.c | 7 +++----
drivers/pinctrl/pinctrl-mcp23s08.h | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c
index 0138638276e7..ac8926985c28 100644
--- a/drivers/pinctrl/pinctrl-mcp23s08.c
+++ b/drivers/pinctrl/pinctrl-mcp23s08.c
@@ -566,9 +566,8 @@ int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
if (ret < 0)
goto fail;
- mcp->irq_controller =
- device_property_read_bool(dev, "interrupt-controller");
- if (mcp->irq && mcp->irq_controller) {
+ mcp->irq_enabled = device_property_present(dev, "interrupts");
+ if (mcp->irq && mcp->irq_enabled) {
mcp->irq_active_high =
device_property_read_bool(dev,
"microchip,irq-active-high");
@@ -601,7 +600,7 @@ int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
goto fail;
}
- if (mcp->irq && mcp->irq_controller) {
+ if (mcp->irq && mcp->irq_enabled) {
struct gpio_irq_chip *girq = &mcp->chip.irq;
girq->chip = &mcp->irq_chip;
diff --git a/drivers/pinctrl/pinctrl-mcp23s08.h b/drivers/pinctrl/pinctrl-mcp23s08.h
index 90dc27081a3c..1aa9b11780fc 100644
--- a/drivers/pinctrl/pinctrl-mcp23s08.h
+++ b/drivers/pinctrl/pinctrl-mcp23s08.h
@@ -30,7 +30,7 @@ struct mcp23s08 {
u16 irq_rise;
u16 irq_fall;
int irq;
- bool irq_controller;
+ bool irq_enabled;
int cached_gpio;
/* lock protects regmap access with bypass/cache flags */
struct mutex lock;
--
2.26.2
next prev parent reply other threads:[~2020-08-14 10:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-14 10:03 [PATCH 0/3] pinctrl: mcp23s08: Fixups for mcp23x17 Thomas Preston
2020-08-14 10:03 ` [PATCH 1/3] pinctrl: mcp23s08: Fixup mcp23x17 regmap_config Thomas Preston
2020-08-28 9:06 ` Linus Walleij
2020-08-28 9:28 ` Andy Shevchenko
2020-08-28 17:30 ` Thomas Preston
2020-08-28 10:09 ` Andy Shevchenko
2020-08-28 19:19 ` Thomas Preston
2020-08-14 10:03 ` Thomas Preston [this message]
2020-08-14 10:03 ` [PATCH 3/3] devicetree: mcp23s08: Remove interrupt-controller Thomas Preston
2020-08-14 13:56 ` [PATCH 0/3] pinctrl: mcp23s08: Fixups for mcp23x17 Thomas Preston
2020-08-17 19:29 ` Rob Herring
2020-08-18 11:09 ` Thomas Preston
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=20200814100357.209340-3-thomas.preston@codethink.co.uk \
--to=thomas.preston@codethink.co.uk \
--cc=devicetree@vger.kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.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).