From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Mark Brown <broonie@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J . Wysocki" <rafael@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH 1/1] regmap: irq: handle HW using separate mask bits for edges
Date: Tue, 4 Dec 2018 19:15:50 +0100 [thread overview]
Message-ID: <20181204181550.29122-2-brgl@bgdev.pl> (raw)
In-Reply-To: <20181204181550.29122-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Some interrupt controllers use separate bits for controlling rising
and falling edge interrupts in the mask register.
Let's reuse the existing type fields in struct regmap_irq to make
regmap_irq_chip available to such HW.
If the type_base and mask_base offsets are the same - assume there
are separate bits for falling and rising edge interrupts and use
the value previously written to the type buffer by the set_type()
callback instead of the entire mask specified for this interrupt
so that we only enable the requested edge interrupts.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
drivers/base/regmap/regmap-irq.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 429ca8ed7e51..109ae353c526 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -194,8 +194,24 @@ static void regmap_irq_enable(struct irq_data *data)
struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);
struct regmap *map = d->map;
const struct regmap_irq *irq_data = irq_to_regmap_irq(d, data->hwirq);
+ unsigned int mask;
- d->mask_buf[irq_data->reg_offset / map->reg_stride] &= ~irq_data->mask;
+ /*
+ * If the type_base and mask_base addresses are the same, then
+ * the underlying hardware uses separate mask bits for rising and
+ * falling edge interrupts, but we want to make them into a single
+ * virtual interrupt with configurable edge.
+ *
+ * Instead of using the regular mask bits for this interrupt, use
+ * the value previously written to the type buffer at the
+ * corresponding offset in regmap_irq_set_type().
+ */
+ if (unlikely(d->chip->type_base == d->chip->mask_base))
+ mask = d->type_buf[irq_data->reg_offset / map->reg_stride];
+ else
+ mask = irq_data->mask;
+
+ d->mask_buf[irq_data->reg_offset / map->reg_stride] &= ~mask;
}
static void regmap_irq_disable(struct irq_data *data)
--
2.19.1
next prev parent reply other threads:[~2018-12-04 18:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-04 18:15 [PATCH 0/1] regmap-irq: support chips with separate mask bits for irq edges Bartosz Golaszewski
2018-12-04 18:15 ` Bartosz Golaszewski [this message]
2018-12-05 15:35 ` [PATCH 1/1] regmap: irq: handle HW using separate mask bits for edges Mark Brown
2018-12-05 20:44 ` Bartosz Golaszewski
2018-12-05 14:19 ` [PATCH 0/1] regmap-irq: support chips with separate mask bits for irq edges Mark Brown
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=20181204181550.29122-2-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=bgolaszewski@baylibre.com \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@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).