From: grant.likely@secretlab.ca (Grant Likely)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/1] ARM: mxc: Fix gpio interrupts for mx53
Date: Mon, 4 Jul 2011 09:40:34 -0600 [thread overview]
Message-ID: <20110704154034.GE29977@ponder.secretlab.ca> (raw)
In-Reply-To: <20110704075025.GB6069@pengutronix.de>
On Mon, Jul 04, 2011 at 09:50:25AM +0200, Sascha Hauer wrote:
> Grant,
>
> Just to let you know:
> When this patch hits mainline you will get a merge conflict in
> arch/arm/plat-mxc/gpio.c as this file is deleted in you gpio
> tree. The correct solution is to remove just arch/arm/plat-mxc/gpio.c
> as this issue is fixed in your tree already.
>
> Sascha
Okay, thanks.
g.
>
> On Fri, Jul 01, 2011 at 04:04:39PM -0700, Troy Kisky wrote:
> > Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
> > ---
> > arch/arm/plat-mxc/gpio.c | 3 ++-
> > 1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c
> > index 6cd6d7f..1955eeb 100644
> > --- a/arch/arm/plat-mxc/gpio.c
> > +++ b/arch/arm/plat-mxc/gpio.c
> > @@ -336,7 +336,8 @@ int __init mxc_gpio_init(struct mxc_gpio_port *port, int cnt)
> > /* its a serious configuration bug when it fails */
> > BUG_ON( gpiochip_add(&port[i].chip) < 0 );
> >
> > - if (cpu_is_mx1() || cpu_is_mx3() || cpu_is_mx25() || cpu_is_mx51()) {
> > + if (cpu_is_mx1() || cpu_is_mx3() || cpu_is_mx25()
> > + || cpu_is_mx51() || cpu_is_mx53()) {
> > /* setup one handler for each entry */
> > irq_set_chained_handler(port[i].irq,
> > mx3_gpio_irq_handler);
> > --
> > 1.7.0.4
> >
> >
>
> --
> Pengutronix e.K. | |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
prev parent reply other threads:[~2011-07-04 15:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1309561479-31909-1-git-send-email-troy.kisky@boundarydevices.com>
2011-07-04 7:50 ` [PATCH 1/1] ARM: mxc: Fix gpio interrupts for mx53 Sascha Hauer
2011-07-04 15:40 ` Grant Likely [this message]
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=20110704154034.GE29977@ponder.secretlab.ca \
--to=grant.likely@secretlab.ca \
--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).