From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/8] mfd: Correct copy and paste mistake in stmpe
Date: Mon, 5 Nov 2012 16:10:32 +0100 [thread overview]
Message-ID: <1352128236-11554-5-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1352128236-11554-1-git-send-email-lee.jones@linaro.org>
When specifying IRQ numbers for the stmpe1601, IRQ defines for the
stmpe24xx were used instead. Fortunately, the defined numbers are
the same, hence why it survived testing. This fix is merely an
aesthetic one.
Cc: Samuel Ortiz <sameo@linux.intel.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mfd/stmpe.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 5c8d8f2..e50ebdf 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -519,12 +519,12 @@ static const u8 stmpe1601_regs[] = {
static struct stmpe_variant_block stmpe1601_blocks[] = {
{
.cell = &stmpe_gpio_cell,
- .irq = STMPE24XX_IRQ_GPIOC,
+ .irq = STMPE1601_IRQ_GPIOC,
.block = STMPE_BLOCK_GPIO,
},
{
.cell = &stmpe_keypad_cell,
- .irq = STMPE24XX_IRQ_KEYPAD,
+ .irq = STMPE1601_IRQ_KEYPAD,
.block = STMPE_BLOCK_KEYPAD,
},
};
--
1.7.9.5
next prev parent reply other threads:[~2012-11-05 15:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-05 15:10 [PATCH 0/8] mfd: Batch together MFD related patches Lee Jones
2012-11-05 15:10 ` [PATCH 1/8] mfd: ab8500-core: Remove unused ab8500-gpio IRQ ranges Lee Jones
2012-11-05 16:16 ` Arnd Bergmann
2012-11-05 16:33 ` Lee Jones
2012-11-05 15:10 ` [PATCH 2/8] mfd: Prevent STMPE from abusing mfd_add_devices' irq_base parameter Lee Jones
2012-11-05 15:10 ` [PATCH 3/8] mfd: Provide the STMPE driver with its own IRQ domain Lee Jones
2012-11-05 15:10 ` Lee Jones [this message]
2012-11-05 15:10 ` [PATCH 5/8] mfd: Enable the STMPE MFD for Device Tree Lee Jones
2012-11-05 15:10 ` [PATCH 6/8] Documentation: Describe bindings for STMPE Multi-Functional Device driver Lee Jones
2012-11-05 15:10 ` [PATCH 7/8] mfd: ab8500-core: Use devm_* memory/IRQ and allocation/free routines Lee Jones
2012-11-05 15:10 ` [PATCH 8/8] mfd: Differentiate between u8500 and u9540 TCDM address mapping Lee Jones
2012-11-11 23:33 ` [PATCH 0/8] mfd: Batch together MFD related patches Samuel Ortiz
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=1352128236-11554-5-git-send-email-lee.jones@linaro.org \
--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).